From patchwork Thu Aug 1 09:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13750104 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) (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 86CEC170A02 for ; Thu, 1 Aug 2024 09:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505863; cv=fail; b=E2MQWo3IRca6KiKOXJLhG8bgxm4QFnx+WLwZoQ87JxOG6oyphPAs6UU0z2BSv4xwNATBCYCsP2UABoPtZ/X4Ujoh50MfonUUPQAjgdh2XqysfWcnvNpG5Jua7SEG1XYNncNY//zpCGJU4d998Rz7qcn7A+5Xi9ulRPjXTdUNm/o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505863; c=relaxed/simple; bh=yS4yEl6yR4cmHuNyWfRi3rAllVyFFxl6jiFhTFQlaV8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pSXObX39p96cao+4WydjtMi64VaPRfE/iiATXwG2+DH6SZSYqPDURqRsJWiYiaanSbY8gbJFd2VX4BPNj9WeWdxuykJelmwMDTYAjY3W6ey9Uu8P4i7qzKcXGbRo+dqYS2gDxBQ/KEIrLCG84+gOflC4wYIk09Xj1/NdQ24B70E= 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=WRthjJdn; arc=fail smtp.client-ip=40.107.223.49 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="WRthjJdn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tdcnQUWyxLKA6eHqgS8/Nr2h6O8T5jC7k38h7UZ0vBtrU0t8v1wF4ACJAuL7egaXna9XbWCTYHli6pBXR9JH7p0CjWm4yHEQpGVixARYzG14NOsv/Y30ohptKSiXv36nu2nfQliQhMGFCB+BKW8+DcrK5wuQ7gqZytFAWfj3P25AItasUUBhN6av5cNC27ZQ/Y/k6yJdcO7emdEiWvimN1zETxev4pt8QJ4Z6MTkNCDj6BdqDVa2kBJHxg8vbrh8xxzTUh52b0BjXtE9txIp2ZHzXYEfCQcYywBpk0vhZDk8HwqiBePksiE/0L4mywnLLAjtKFIoKkoaQbDMSMY1mw== 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=NZMdjvihJ0DhEGw5Z9U6qUM6UQBN/SuN70SZJI1bjiI=; b=oEd6gSaXQRP9p1mGYUWGKPo8oIxTWpNd8KaXVBgdhmn9QZfhusgkAU/B5U8hwgI5vSGbdK9wSDlV7uzriSlrcHveVDHCiWMbfVknl7xFBGxwy2yuHtL4nsAuMDRjmm7pgOaI89KrrBHKJf/wT73sRbTC+DoP++Hkj4FLbgXZFdmJMMeXR8eckRPSkDfgH6EOnqbpsgmoe4Ptedtqq0AiFzw25WI5PLcZ3j1iB+jRl+TOTB50KEuuGe/j0O5dcz5cztqzrK+/YUYoI9JAtYueXEwyLx4RnzIkFsrRBo+NGiFDFa/ZTe9EaO2vYIYmSbtVIBSxBEJUJWjctAcyxKdQsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=NZMdjvihJ0DhEGw5Z9U6qUM6UQBN/SuN70SZJI1bjiI=; b=WRthjJdnU1k3zKlzBbg1yGlq8SC99T1E5/3v08O3vAhsa+N+vcKLuLfgUvqR4CEOeacLLWNGPq7RmYuSFhSVBIHxiH+nlaNhwFZr99p47gXXgxecisrHu0hM+Ur1KcHhYOuYdFR/Cr8WNmpAH/kuMqtNVvsfrsw7BDT9b4G0Z3900ohlyR7tPUFaa/MQx8zm8zXZuw/7IZA2lW9S8W/9tI4sZU+OYUZzM4yjkdAaJYfSBfcAYguIfJe1jZvQ18R5EhgEPbpmBU30pDT0ZSnDw3aow94TddN1UX5bdoCRy1qWYeAjQeCSG7hoPVE/NUTeLf/LGOIT0NFYZA9aMIfb+w== Received: from BN0PR02CA0034.namprd02.prod.outlook.com (2603:10b6:408:e5::9) by CH3PR12MB7738.namprd12.prod.outlook.com (2603:10b6:610:14e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19; Thu, 1 Aug 2024 09:50:58 +0000 Received: from BN3PEPF0000B370.namprd21.prod.outlook.com (2603:10b6:408:e5:cafe::5b) by BN0PR02CA0034.outlook.office365.com (2603:10b6:408:e5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.23 via Frontend Transport; Thu, 1 Aug 2024 09:50:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN3PEPF0000B370.mail.protection.outlook.com (10.167.243.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.11 via Frontend Transport; Thu, 1 Aug 2024 09:50:57 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:48 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:48 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 1 Aug 2024 02:50:44 -0700 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Jay Vosburgh" , Andy Gospodarek CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Hangbin Liu , Jianbo Liu , Tariq Toukan Subject: [PATCH net V2 1/3] bonding: implement xdo_dev_state_free and call it after deletion Date: Thu, 1 Aug 2024 12:49:12 +0300 Message-ID: <20240801094914.1928768-2-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240801094914.1928768-1-tariqt@nvidia.com> References: <20240801094914.1928768-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B370:EE_|CH3PR12MB7738:EE_ X-MS-Office365-Filtering-Correlation-Id: 729f2a5e-4d56-4437-d753-08dcb20f71b6 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: Qv2KeRVwDF6YO1AMO4SR9JDN2QCJ2mDbC45cHq3NwePVM3U8+e6EJiS7QCv/uZp7JjiL5LF93Ev32j0eS4cfaskoAdFuj9tZR9g/wiFlmE2akqwEYeJcgxA3Tl/rQjKOEFxBzMl9IXv6MVZ/kOWp8gWOvx4yheitMPpHqrKwcCrTtn05+c7W/s34bPLOmZuIVimNkKpsG4ZITWUn3hQ3tWKMZXrty4nipbeaoAvvf59G6uYLNX16ed/JEusz1PKMh+uiOlJpOt/FDjW/+YMd7DFwiMB5ZWbrzkc5nQA3P5LS4YRisvJN58f3y57ruU5xyv7njRlJAHtZkX4hSsBwkPenvmQFNsQ3spF1gSeBuvrXLZ3kT2GZ2xlKKYdEN6XiEIJWto67OOmhG2qZXpGT9YiL8bIFaA0w5+ZJ3vao03jCUaTSn77C1A76nTCEafwEhLg6lKfshnyMhn0MxrUH2JWeCbL78omrybkg8Ddoh7RgA2mLoQC4POSh/SHqBPylAPHduwXI0Gq00UerrRRpCNTNgqvFNehIXClkFF+WgjotgPSrQArMgbheyZ0DZGNnSXdJQLvtHTsN4JwHtJjNlS3FtPr1PP8PljjHf5Tg2juEjdn3U4nyYzM3Z7IWFsQt0sjbUD8g7u9ktrq0X1TxwsRhw5JEcuQLfHsmXUaJRe0MDh0bbZEKbOMD5E9zMTrd8b+cdzZm8OgfxR0Na2rTilFvTsxJ9TgRXnuLzm5NLczlatIXmB0KJONLB0VIRzr1e/n92X6yaBqvydzM89i/Q841YPAajW8n1jnc3y/XLU0rbPARlST7aAaKPIZQ7lBNLgDcqUXUKaQvzETo6I16iBKOairSbtf0DiQOdLlELKY5ZQ2ufUT11H3aTjcB5pQtWVnl36qKm5goh/vERxS1aH44h8NYFTKUXcsJZonzU8AqSQtv/7K9NIgHfr2NERfQvz+GCgs35ED1q3fTYWXAq+uKAnMErMr2VCaaohYpR6pVHwO+zkbHoAJttMlKAcNlJxZvx4k01t+DU5qYP+0OAGdgHyFyjkQAeOhSjOAVOwpqFkIsrW2e1ra1e86npcLulFR3o55ZRYUMLDLmNZdOBtmNzfCcviDFP38Qaog+S9bDbG6H1E2Zd0X5f511OvAMqt6xhdgH+AbWgLX+SO+yoWpi5jITvL9TaADipU//8gcn6LMYhFw6EP3DBYUoGu+zkI99EcMMBsaOtRBFL6B8i5jjFo1neFc72zMcKMXBHMKRbQOXU91HFQGBrYVCqekxZ5wgcBQpcUjYqEw/oSrGiJ5naemhMRn++1MchAyEPQiSu9MzDpKOQdhH1AZrq5rYKFx3j6/xdAqly1mOOg2yYRJr3hBsn4wibYo19CwfaQjvs3GiScsPgxqf++vSD3w/OfU/4C1eZbsSf8qEl7Q590YfYpXSEwDYQa/XoLFPp9UyaaxMKkthub8CK50xjnm9 X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 09:50:57.9954 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 729f2a5e-4d56-4437-d753-08dcb20f71b6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B370.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7738 X-Patchwork-Delegate: kuba@kernel.org From: Jianbo Liu Add this implementation for bonding, so hardware resources can be freed after xfrm state is deleted. And call it when deleting all SAs from old active real interface. Fixes: 9a5605505d9c ("bonding: Add struct bond_ipesc to manage SA") Signed-off-by: Jianbo Liu Signed-off-by: Tariq Toukan --- drivers/net/bonding/bond_main.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1cd92c12e782..774d7a39723f 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -581,6 +581,8 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) __func__); } else { slave->dev->xfrmdev_ops->xdo_dev_state_delete(ipsec->xs); + if (slave->dev->xfrmdev_ops->xdo_dev_state_free) + slave->dev->xfrmdev_ops->xdo_dev_state_free(ipsec->xs); } ipsec->xs->xso.real_dev = NULL; } @@ -588,6 +590,33 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) rcu_read_unlock(); } +static void bond_ipsec_free_sa(struct xfrm_state *xs) +{ + struct net_device *bond_dev = xs->xso.dev; + struct net_device *real_dev; + struct bonding *bond; + struct slave *slave; + + if (!bond_dev) + return; + + bond = netdev_priv(bond_dev); + slave = rcu_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; + + if (!slave) + return; + + if (!xs->xso.real_dev) + return; + + WARN_ON(xs->xso.real_dev != real_dev); + + if (real_dev && real_dev->xfrmdev_ops && + real_dev->xfrmdev_ops->xdo_dev_state_free) + real_dev->xfrmdev_ops->xdo_dev_state_free(xs); +} + /** * bond_ipsec_offload_ok - can this packet use the xfrm hw offload * @skb: current data packet @@ -632,6 +661,7 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs) static const struct xfrmdev_ops bond_xfrmdev_ops = { .xdo_dev_state_add = bond_ipsec_add_sa, .xdo_dev_state_delete = bond_ipsec_del_sa, + .xdo_dev_state_free = bond_ipsec_free_sa, .xdo_dev_offload_ok = bond_ipsec_offload_ok, }; #endif /* CONFIG_XFRM_OFFLOAD */ From patchwork Thu Aug 1 09:49:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13750105 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2062.outbound.protection.outlook.com [40.107.95.62]) (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 1DA268F70 for ; Thu, 1 Aug 2024 09:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505872; cv=fail; b=tU7rmlGwfkITStUP3ybQ1B2qDkBAoc+/8CBB20psCRewNtlRc0x/ZLlPCW8tb2rxqbi4n6qB8jRLOuU6O5nqQonWI/kEOEeWeT9kZCMQAu6/nqhPcl+Xr9/Kz3zekdQocpFw0TP2yQP9cM40bT3sWWgx9JkhqaLqA5+yNcsvviE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505872; c=relaxed/simple; bh=7r9n+F17kPfo+tBt2kTzyxDPzfUN9dZEUrnOlmyyZh4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Bz1BVZoaP/NXgcW8o1WuErxp2RE4jygLfqglhAIP3F8wfFRalToUL1/YfsHX2NjiyRYqPqa9OKi02e8vWx2Dagtl4CjG4iWoRJ+xGNKIQ13b/WG34VEgl6AQ/wWcWG3NC9sHuAUpyypOcfe4YV8BSvS4rK4ZCLus3egHOWv7lik= 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=ne/zLqmc; arc=fail smtp.client-ip=40.107.95.62 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="ne/zLqmc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PYU8rcsN6ISG4f/aHHqaY7vBSZYfCnoT1SRx9S5RS/Y1WvSt5UHX4nL74m/JPBXJEDeopxF/N//IvUa5eIfyiRu1kRbBV2z/psakQgJYYcDpCmQCcOLqMqZuXAouPWIwx9gc4Yarc4Lxen1nx7AJBpfIMQn3ibx7tjLnT0DYnMaaiERqd/dG6+OUT6XOodrA1Q+ilZVMWRV4TdpXqbZQqG90BL2ds2chxqXEvJithhGC6mkp7TS4N6IIkDWjBgUdgot8dBdjUtnjbD+4+OrADTGSqkZA0PUchdn9Lh0HBldDQp67DLanm0jd0rx34iZP3FQFAR2LKLFi605j5rJNfw== 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=M4mSTfAi4qiQwUSH/+c0mC2Kqvgr/AJu+0DGkstM/Es=; b=MWaux8DBr13ZJagK8DdpUNfkPcRoDzzs8g8LIuY0LDwfC1CAbeqh4WySDYL2ye1auuGeasW+9tl19UG67Quxy6/Uq3qVXplE6g+U+eTpSzgUPqvqR3d2WSvOxqXVUhJiliVBhoRDYsRN25y1FViUw+0nFQwmxQ85HZ5b+pdKHdv16kK0M0ut6tEicU5ip/aoS/IcNyfVdtu6+Yp++t8TEk4ljUeb6VHBq8YDZWv/X3zFFPNvBK/ew73wgKXZyJzYIvIb8c/62OlKGzUp1QVLLTeBGiLBj0jdVeqoY3zVNFKPOP6+JKT9yh0T70G4dmmzwth0eCPMbiCU8kTfQ4ToOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=M4mSTfAi4qiQwUSH/+c0mC2Kqvgr/AJu+0DGkstM/Es=; b=ne/zLqmcuBgOaGRp53sjNXmwlZoOVHGmHwKOcqxd9oYG/dY/58acMagwOuMuP5ecw5vGkiBU7wwhRpu420AoMNZzKmXgbSZp3k4regZ4UKp53je6E8aOAAIo6Tlu7OsNEFQOL1XevGFB2hTO+LKGIeav5H+LnVgUFfkSQcgT2gyf2uwvo9p/Y6w9loFKfcorK3AQ3nYwNvoFI6ccad1NNXXKUQfbDni5isolYTVnTvJblMJQNbzjg/wkWufkHB62TRSNeeDu+ZeNAA3ZJLeQoPoLKYAQ5ogtKqg/Pu0Zn2fVSdvodvdUr1TsX4w4B7ifK1PKt9GXF/zJhCKXfjztdw== Received: from BN9PR03CA0074.namprd03.prod.outlook.com (2603:10b6:408:fc::19) by MW4PR12MB6899.namprd12.prod.outlook.com (2603:10b6:303:208::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.28; Thu, 1 Aug 2024 09:51:05 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:fc:cafe::ed) by BN9PR03CA0074.outlook.office365.com (2603:10b6:408:fc::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.21 via Frontend Transport; Thu, 1 Aug 2024 09:51:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Thu, 1 Aug 2024 09:51:04 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:52 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:51 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 1 Aug 2024 02:50:48 -0700 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Jay Vosburgh" , Andy Gospodarek CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Hangbin Liu , Jianbo Liu , Cosmin Ratiu , Tariq Toukan Subject: [PATCH net V2 2/3] bonding: extract the use of real_device into local variable Date: Thu, 1 Aug 2024 12:49:13 +0300 Message-ID: <20240801094914.1928768-3-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240801094914.1928768-1-tariqt@nvidia.com> References: <20240801094914.1928768-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|MW4PR12MB6899:EE_ X-MS-Office365-Filtering-Correlation-Id: 0265cd8a-9d55-412f-56b5-08dcb20f7567 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: C7mLN5JI7cw4ZOystUXaOVjr5Y2mASf1bmJwnSu2Ll2oy03gtqnQjhw9pNNt6ES3b2mx36MQKYJ5cDuYkcKjFb87wMN4EL6cgcxT5pmJWIrB0F8eeQFMxwurtgzpJtLwZ5mk4OR+otyv0ZN8vd6iPlKQG/Pfl8YaRsQerBOVTmzJ9HPe0whMYIRB7hjsk5Ej0mrX35+jzMymqIcjinvpd+2rI7b/OCZJMHXNndYqTguMK34iQs2nyFxR0A+38xZGZmo5ShE3xKQBNRB/OxE2X+EK7e6rwDDUJh0bJeaDNDLWgYdVbuYBWrwK4QE0fB0EDqBfLmyW05qQmvo+2dp2jIiagYsyzgyI9XX+cGM67fjX6L4w88T/BoHCWBqz41ykhoV96/0lWm6/7FLSohw4NTf2W7bAMQJzfZKcSHoVq+a57UTY4UkeifFOz7msuocVheOcEzfFlUqIg+VdKVPXgSI/dQGle0mvmvagTc0RvhG5UVP8MzvfGVAE6g6YvT7zVpmY+Fqvh6ZRB4oBsp7gIq2GI5UFZbWxzndXO9Kxo8IWYA1Bjw1oqDEhMxPL8hjzzb79HQ/L4G21KbyEvJ9uqkRnxX1PnujaCbLqskWHUwYigDroRodNUJjiQGVQaKbveH+2EJ77x+HqFkDIcohfJjeK6UtyX6yOnwe+qoyVpQ2OIuVp4+AG8eQKnTqCuwGq0M906cASKqAgPhrGJmSAi54U7LxdxQE4eYAEvTn07SJG4iU0MkxriGTpAkQGKGgABVgxXJREkhJL8DTLj6+xLicF2IMlW/SU4phcXwjyUYm1Xu9WYvqCSW/LdKJSBV+1wSTaOFyIEvvcgenVBQVys7GkvF0elFJziiF3cOHX+Lbro8geIHxfQbJlLRaYHC1XKFOgvdQUbqwkQKi84UdPUPNh126/NPOmzJ+bP3Zh7YNwogfH9Io+rGpeKb68RFu8VlluSxCLO/yFE92jdddsVgZy89MHy037ZmnDll0fL/CLe41KAzdEju6OSc6R4p/GUVJPTXFxIxy0yj1v40uNtkq6QHqjnPk+MDWKx04ZaU2DGhA0TOh0WcK3W9uIkCL4LEP7CzYvFPL0bmmNRY3zwmbcHXZ9gP+HSoenMcDzW1IF1btQj0nB1L2esB+gq7onZa30sqg+qR0XVutDrOtY/TOlg9SYPLR9tRi6CvnKt56ArjcOkvAvBdY9jQgfOhjtmOgtc2YlHKte5nPxSVj4wdpwY6otgBXTzYqCTWIOxKkPAq7OoEWGc82zZnr3ny27glrksv5orw2qP1QGrun/TrBhcDuThiIaYCKo2ndo/gXNNaMLBb0OSoPz56oqzHTUwUGLOJwyyA0LdaaPndi4xJNI5MuRT6EUTC8hMMfAzWS2dSHJt89rSBDJ/dc7utGvysWN4wiVygX0thqSxRbNj4Xpd9zDX8CNsPHykLB6Bl78lskcIGIkyvOIL7oftcSA X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 09:51:04.1853 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0265cd8a-9d55-412f-56b5-08dcb20f7567 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6899 X-Patchwork-Delegate: kuba@kernel.org From: Jianbo Liu Add a local variable for slave->dev, to prepare for the lock change in the next patch. There is no functionality change. Fixes: 9a5605505d9c ("bonding: Add struct bond_ipesc to manage SA") Signed-off-by: Jianbo Liu Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan --- drivers/net/bonding/bond_main.c | 58 +++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 774d7a39723f..e6514ef7ad89 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -427,6 +427,7 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, struct netlink_ext_ack *extack) { struct net_device *bond_dev = xs->xso.dev; + struct net_device *real_dev; struct bond_ipsec *ipsec; struct bonding *bond; struct slave *slave; @@ -443,9 +444,10 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, return -ENODEV; } - if (!slave->dev->xfrmdev_ops || - !slave->dev->xfrmdev_ops->xdo_dev_state_add || - netif_is_bond_master(slave->dev)) { + real_dev = slave->dev; + if (!real_dev->xfrmdev_ops || + !real_dev->xfrmdev_ops->xdo_dev_state_add || + netif_is_bond_master(real_dev)) { NL_SET_ERR_MSG_MOD(extack, "Slave does not support ipsec offload"); rcu_read_unlock(); return -EINVAL; @@ -456,9 +458,9 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, rcu_read_unlock(); return -ENOMEM; } - xs->xso.real_dev = slave->dev; - err = slave->dev->xfrmdev_ops->xdo_dev_state_add(xs, extack); + xs->xso.real_dev = real_dev; + err = real_dev->xfrmdev_ops->xdo_dev_state_add(xs, extack); if (!err) { ipsec->xs = xs; INIT_LIST_HEAD(&ipsec->list); @@ -475,6 +477,7 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, static void bond_ipsec_add_sa_all(struct bonding *bond) { struct net_device *bond_dev = bond->dev; + struct net_device *real_dev; struct bond_ipsec *ipsec; struct slave *slave; @@ -483,12 +486,13 @@ static void bond_ipsec_add_sa_all(struct bonding *bond) if (!slave) goto out; - if (!slave->dev->xfrmdev_ops || - !slave->dev->xfrmdev_ops->xdo_dev_state_add || - netif_is_bond_master(slave->dev)) { + real_dev = slave->dev; + if (!real_dev->xfrmdev_ops || + !real_dev->xfrmdev_ops->xdo_dev_state_add || + netif_is_bond_master(real_dev)) { spin_lock_bh(&bond->ipsec_lock); if (!list_empty(&bond->ipsec_list)) - slave_warn(bond_dev, slave->dev, + slave_warn(bond_dev, real_dev, "%s: no slave xdo_dev_state_add\n", __func__); spin_unlock_bh(&bond->ipsec_lock); @@ -497,9 +501,9 @@ static void bond_ipsec_add_sa_all(struct bonding *bond) spin_lock_bh(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { - ipsec->xs->xso.real_dev = slave->dev; - if (slave->dev->xfrmdev_ops->xdo_dev_state_add(ipsec->xs, NULL)) { - slave_warn(bond_dev, slave->dev, "%s: failed to add SA\n", __func__); + ipsec->xs->xso.real_dev = real_dev; + if (real_dev->xfrmdev_ops->xdo_dev_state_add(ipsec->xs, NULL)) { + slave_warn(bond_dev, real_dev, "%s: failed to add SA\n", __func__); ipsec->xs->xso.real_dev = NULL; } } @@ -515,6 +519,7 @@ static void bond_ipsec_add_sa_all(struct bonding *bond) static void bond_ipsec_del_sa(struct xfrm_state *xs) { struct net_device *bond_dev = xs->xso.dev; + struct net_device *real_dev; struct bond_ipsec *ipsec; struct bonding *bond; struct slave *slave; @@ -532,16 +537,17 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) if (!xs->xso.real_dev) goto out; - WARN_ON(xs->xso.real_dev != slave->dev); + real_dev = slave->dev; + WARN_ON(xs->xso.real_dev != real_dev); - if (!slave->dev->xfrmdev_ops || - !slave->dev->xfrmdev_ops->xdo_dev_state_delete || - netif_is_bond_master(slave->dev)) { - slave_warn(bond_dev, slave->dev, "%s: no slave xdo_dev_state_delete\n", __func__); + if (!real_dev->xfrmdev_ops || + !real_dev->xfrmdev_ops->xdo_dev_state_delete || + netif_is_bond_master(real_dev)) { + slave_warn(bond_dev, real_dev, "%s: no slave xdo_dev_state_delete\n", __func__); goto out; } - slave->dev->xfrmdev_ops->xdo_dev_state_delete(xs); + real_dev->xfrmdev_ops->xdo_dev_state_delete(xs); out: spin_lock_bh(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { @@ -558,6 +564,7 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) static void bond_ipsec_del_sa_all(struct bonding *bond) { struct net_device *bond_dev = bond->dev; + struct net_device *real_dev; struct bond_ipsec *ipsec; struct slave *slave; @@ -568,21 +575,22 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) return; } + real_dev = slave->dev; spin_lock_bh(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { if (!ipsec->xs->xso.real_dev) continue; - if (!slave->dev->xfrmdev_ops || - !slave->dev->xfrmdev_ops->xdo_dev_state_delete || - netif_is_bond_master(slave->dev)) { - slave_warn(bond_dev, slave->dev, + if (!real_dev->xfrmdev_ops || + !real_dev->xfrmdev_ops->xdo_dev_state_delete || + netif_is_bond_master(real_dev)) { + slave_warn(bond_dev, real_dev, "%s: no slave xdo_dev_state_delete\n", __func__); } else { - slave->dev->xfrmdev_ops->xdo_dev_state_delete(ipsec->xs); - if (slave->dev->xfrmdev_ops->xdo_dev_state_free) - slave->dev->xfrmdev_ops->xdo_dev_state_free(ipsec->xs); + real_dev->xfrmdev_ops->xdo_dev_state_delete(ipsec->xs); + if (real_dev->xfrmdev_ops->xdo_dev_state_free) + real_dev->xfrmdev_ops->xdo_dev_state_free(ipsec->xs); } ipsec->xs->xso.real_dev = NULL; } From patchwork Thu Aug 1 09:49:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13750106 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2087.outbound.protection.outlook.com [40.107.101.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 D8D5316FF48 for ; Thu, 1 Aug 2024 09:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505874; cv=fail; b=d/D5qqSmnWpZJy43ZwkpLJPdY3bL1sjIDqP/QT62ykidOsOvSE6C60ae5gPa4wnH3y1tOkPdkUWmFri9h1RDyIulgtjTYgettRC1XVlZceIEVpD8EmbRi/ud4NhHUU39WlwA6WTxdDXx1azrYER05+s1+QVX/q8MS0QTEo7hS0E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722505874; c=relaxed/simple; bh=0FxIku6JRZjQrfP3dwU+F22X/jsDhvsk8D6+93suyRo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KuWcjq8829TeIB9WMqCSz6pJu58I4rDFonj6H8oXL36U38W0TymiboEjbdEADA8hnE3N+lndhZbmjkLffEeZxdxwlyGUDrnZvZN9vWByHlNTEh+T91Ns8OJ9j92DCYkdmY2is3QJbeM9EbZgRzu6IiwKVIP5VZfEU0KT9bNGhM8= 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=UotjrDS2; arc=fail smtp.client-ip=40.107.101.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="UotjrDS2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Hj+bjzaXDVkDyg2TARW0yPL6ORPXeIjeVTEzA8myXeOxH6KV8GPYv/iljz21/cWRETni3XT5c8WkftyyImk/XdSze/4ff4qshfwg+Rs2c5Bi5xrtGpzvXXUfk4uRXmx41hbcPlIOaUznL0TsJtjD/ewy3ew2dJ+xBIFhxXOMvCDmbEIgbwU6hKt20c/opWFyABIczG9Gf1Ux5RdTRs6HoVBkenE4CcfGVzSeeY4t6Vi70vq234DeIvrCRjfgNSP/hDJDCvP6/brx4Av5aW9CCiKS/+AGR+Vy27iqT5reBOC7kL5CydsUbOFk0c+SfDsqFkZljd4u9dl5usA1CjFL1w== 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=dqC8iJupWHrzceM8Ypurys4yCxOobvPDGLjfbXA5CE8=; b=gEwNjTIX73C5DuuamwChszkSpJJuP4SFXDd5eh8J1ytewsUXP9l6MObTRI80SeraYudKv1FlNk2sJGyPAMRKPdUtK3qvngpsBnULRLksbkUa6p09CHTKL+th60xVPs3iS4NzEkTf87bihpqc6+WyOvLt67K00AapLPEyymPQLdh6kAXQBvDrNIPUikpHmFikBSahIlLMFis0ecg0W7SLtF4TJypKE4Od9SvF+4VZY53UyXzcAsnDRsK2VmPqKu97Sh0rmCXCKwfo6lxoVpsq0iUi0e9F0pZCCUyZyfiUEQG2GA2XVOPdE3aALrNjJm+eJu0L4ZeZdFQ1UD/hBimyXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=dqC8iJupWHrzceM8Ypurys4yCxOobvPDGLjfbXA5CE8=; b=UotjrDS23dP2wTOLIa3x06/XPcZZaoVVUG+26R7Cu2WaxZevDT3+8JnySfuX9hWbGzwDY2O3HVa5qam9llqUln9bEe8VG0uND8t4T6qU6iuZTZdHNnvrftB2rD2KRQIONC4d7Gja8mY8RS/vHfGKUupb+iwplmQUhBunh4ErT03+1tBtHD0S/mYFuda5t7QYBchSV8xAMAfFaINbaOUtPsF2idbC9pKEBBNAs9DbO02GY/6uHFLZ60n1dSTKQrH+8pYtTHiT6R03mN1CT0Hu0+d6DyEGisNKKiiPA0ZkiGy6q05XJ0ksn1o1/bTwq3VCgsg7LBURR1uJq7vBlp02MQ== Received: from BN0PR08CA0002.namprd08.prod.outlook.com (2603:10b6:408:142::18) by MN2PR12MB4144.namprd12.prod.outlook.com (2603:10b6:208:15f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.23; Thu, 1 Aug 2024 09:51:10 +0000 Received: from BN1PEPF00005FFC.namprd05.prod.outlook.com (2603:10b6:408:142:cafe::d4) by BN0PR08CA0002.outlook.office365.com (2603:10b6:408:142::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.22 via Frontend Transport; Thu, 1 Aug 2024 09:51:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF00005FFC.mail.protection.outlook.com (10.167.243.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Thu, 1 Aug 2024 09:51:08 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:56 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 1 Aug 2024 02:50:55 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 1 Aug 2024 02:50:52 -0700 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Jay Vosburgh" , Andy Gospodarek CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Hangbin Liu , Jianbo Liu , Tariq Toukan Subject: [PATCH net V2 3/3] bonding: change ipsec_lock from spin lock to mutex Date: Thu, 1 Aug 2024 12:49:14 +0300 Message-ID: <20240801094914.1928768-4-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240801094914.1928768-1-tariqt@nvidia.com> References: <20240801094914.1928768-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFC:EE_|MN2PR12MB4144:EE_ X-MS-Office365-Filtering-Correlation-Id: ea0ea959-2f6f-49d6-a691-08dcb20f7829 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: zZNP0BakOeseCEvsc9GOQnUBOtS5b9lp7yHNzaLAbRS08x78+tD3zBjgm4yPuaS3ebPOAkumSzHRjXm14KtoypDYXcXIDqz4WowcxKW5IvtgFEofRtSssr4YUHe0wfCUId0Ld+118nRt0P5JaTmg+TPuiTo+6pyB7ES0HrI4W9/yTkjNIEGxT6tALz6TFgaVigMJOD3uHGZm+UOaf0ZWZl9F02B0iRbsaKYeNz6AtkALuV2Js9OJE1rs4R0hV3+/HsjB444FAQnjHIlYyu7t1MXTTwOvYKLedoXMdrRvjyNk5vu2ufOXnZkC4X9Z+H/LAYMgazW7Bo97L1dB6SGPXo0FVZEh2/XfAPl8OjXeJfkUEUT2XnzyRkX/FkZY8NUqDdNzAkE/+QyuFVIMJpdNVe8QVqo9gcs9B/H30133PnVaKKp7lntPyiFLbatTdBp01Ioa+5oCehGROEcNIFIbddeFuio2d8c9dlEzZeOyVSwV//zjaMUfp6xZuQ05khOLL+YS0cq35Oif+ghRiDaFIE6+K5T5rgeFRawZktetRwcvU7gFRBs35gQUXo/7zZLJl7f9BjH5EOrZAbucIWl5eiTWBeq6TQBssC22j4X7hJAN/56GDNPAgjvPRsNrsxS4kqulS+74FD81WEASLjNgMAAlbmcqlowbqGcg4uWLbuXnEHl+fi4tCYYbPWREc22z+3g/QgdfY1BjagQclHH7JEpWGnINa61UOrlTdFaymVuHSrhsI2vJ5qg0O6Ymv+Wa796yniIf1EmUagXD55+FyiXo2r5qG0OfktaHpzj7GADu2o2xFTTlJXhjuO1TnWDgT7DqeaAxiAYWAE+4Xen2iqCxeRG2GGWYx3jSQjbm0q5cyxq3KRGfi6AgPUuPTZv0E5UdpUVC12nC94En3N4KtnUWbnqOvj1qKBHLGI3sgToxgAZfMhdczp+atwx0inBQjtq3I4YYKkW8MRF9ImvOUZXBoXxSW99Wq1fHs/JX2XF9Y5ChbrnLr8D9lMFJXCzEKQ+6rdee0GKoc4AaeZUg6C4Z2PPlBfWcfdulrjrOIw767/+kAeiVwMx2AKGzzfD9jT+O+ZOF3CyonKGC7jyWN9tmmOeZGDu+xqP0VNOMkd6UWcIWa8p8UNvwkoNlT1PDSruGfe8yo2t+ON3HzwJ8x2pR0c8BI3wlslc7VzCUdrIV4wq2VG7cT2+FM1NxjBR7RRwwofpiDWfZDEMItFp82XilwKV3864Ee3lBjnehb/KdFMRIpF54XfFsQ3k1m/DoITUiyopKgxkWjHcNxxm2u1tmZJOtqsW6987+M8RLoiZrXSHVe6IcO1zsZnzFiZrK2iCOE5Wq04iFyhrXmruF829LnTjEUtUx9i4HZSWz4+k1gxkTJtDOzI1Gyu1Uc2N0zwVp3VxmH20pnzVIO0XvYLVaQc43MxJlCprebDwjyqygot02FF/Q4+G5EP8/LujG X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 09:51:08.7985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea0ea959-2f6f-49d6-a691-08dcb20f7829 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00005FFC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4144 X-Patchwork-Delegate: kuba@kernel.org From: Jianbo Liu In the cited commit, bond->ipsec_lock is added to protect ipsec_list, hence xdo_dev_state_add and xdo_dev_state_delete are called inside this lock. As ipsec_lock is a spin lock and such xfrmdev ops may sleep, "scheduling while atomic" will be triggered when changing bond's active slave. [ 101.055189] BUG: scheduling while atomic: bash/902/0x00000200 [ 101.055726] Modules linked in: [ 101.058211] CPU: 3 PID: 902 Comm: bash Not tainted 6.9.0-rc4+ #1 [ 101.058760] Hardware name: [ 101.059434] Call Trace: [ 101.059436] [ 101.060873] dump_stack_lvl+0x51/0x60 [ 101.061275] __schedule_bug+0x4e/0x60 [ 101.061682] __schedule+0x612/0x7c0 [ 101.062078] ? __mod_timer+0x25c/0x370 [ 101.062486] schedule+0x25/0xd0 [ 101.062845] schedule_timeout+0x77/0xf0 [ 101.063265] ? asm_common_interrupt+0x22/0x40 [ 101.063724] ? __bpf_trace_itimer_state+0x10/0x10 [ 101.064215] __wait_for_common+0x87/0x190 [ 101.064648] ? usleep_range_state+0x90/0x90 [ 101.065091] cmd_exec+0x437/0xb20 [mlx5_core] [ 101.065569] mlx5_cmd_do+0x1e/0x40 [mlx5_core] [ 101.066051] mlx5_cmd_exec+0x18/0x30 [mlx5_core] [ 101.066552] mlx5_crypto_create_dek_key+0xea/0x120 [mlx5_core] [ 101.067163] ? bonding_sysfs_store_option+0x4d/0x80 [bonding] [ 101.067738] ? kmalloc_trace+0x4d/0x350 [ 101.068156] mlx5_ipsec_create_sa_ctx+0x33/0x100 [mlx5_core] [ 101.068747] mlx5e_xfrm_add_state+0x47b/0xaa0 [mlx5_core] [ 101.069312] bond_change_active_slave+0x392/0x900 [bonding] [ 101.069868] bond_option_active_slave_set+0x1c2/0x240 [bonding] [ 101.070454] __bond_opt_set+0xa6/0x430 [bonding] [ 101.070935] __bond_opt_set_notify+0x2f/0x90 [bonding] [ 101.071453] bond_opt_tryset_rtnl+0x72/0xb0 [bonding] [ 101.071965] bonding_sysfs_store_option+0x4d/0x80 [bonding] [ 101.072567] kernfs_fop_write_iter+0x10c/0x1a0 [ 101.073033] vfs_write+0x2d8/0x400 [ 101.073416] ? alloc_fd+0x48/0x180 [ 101.073798] ksys_write+0x5f/0xe0 [ 101.074175] do_syscall_64+0x52/0x110 [ 101.074576] entry_SYSCALL_64_after_hwframe+0x4b/0x53 As bond_ipsec_add_sa_all and bond_ipsec_del_sa_all are only called from bond_change_active_slave, which requires holding the RTNL lock. And bond_ipsec_add_sa and bond_ipsec_del_sa are xfrm state xdo_dev_state_add and xdo_dev_state_delete APIs, which are in user context. So ipsec_lock doesn't have to be spin lock, change it to mutex, and thus the above issue can be resolved. Fixes: 9a5605505d9c ("bonding: Add struct bond_ipesc to manage SA") Signed-off-by: Jianbo Liu Signed-off-by: Tariq Toukan --- drivers/net/bonding/bond_main.c | 75 ++++++++++++++++----------------- include/net/bonding.h | 2 +- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e6514ef7ad89..0f8d1b29dc7f 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -436,41 +436,34 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, if (!bond_dev) return -EINVAL; - rcu_read_lock(); bond = netdev_priv(bond_dev); slave = rcu_dereference(bond->curr_active_slave); - if (!slave) { - rcu_read_unlock(); + real_dev = slave ? slave->dev : NULL; + if (!real_dev) return -ENODEV; - } - real_dev = slave->dev; if (!real_dev->xfrmdev_ops || !real_dev->xfrmdev_ops->xdo_dev_state_add || netif_is_bond_master(real_dev)) { NL_SET_ERR_MSG_MOD(extack, "Slave does not support ipsec offload"); - rcu_read_unlock(); return -EINVAL; } - ipsec = kmalloc(sizeof(*ipsec), GFP_ATOMIC); - if (!ipsec) { - rcu_read_unlock(); + ipsec = kmalloc(sizeof(*ipsec), GFP_KERNEL); + if (!ipsec) return -ENOMEM; - } xs->xso.real_dev = real_dev; err = real_dev->xfrmdev_ops->xdo_dev_state_add(xs, extack); if (!err) { ipsec->xs = xs; INIT_LIST_HEAD(&ipsec->list); - spin_lock_bh(&bond->ipsec_lock); + mutex_lock(&bond->ipsec_lock); list_add(&ipsec->list, &bond->ipsec_list); - spin_unlock_bh(&bond->ipsec_lock); + mutex_unlock(&bond->ipsec_lock); } else { kfree(ipsec); } - rcu_read_unlock(); return err; } @@ -481,35 +474,43 @@ static void bond_ipsec_add_sa_all(struct bonding *bond) struct bond_ipsec *ipsec; struct slave *slave; - rcu_read_lock(); - slave = rcu_dereference(bond->curr_active_slave); - if (!slave) - goto out; + slave = rtnl_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; + if (!real_dev) + return; - real_dev = slave->dev; + mutex_lock(&bond->ipsec_lock); if (!real_dev->xfrmdev_ops || !real_dev->xfrmdev_ops->xdo_dev_state_add || netif_is_bond_master(real_dev)) { - spin_lock_bh(&bond->ipsec_lock); if (!list_empty(&bond->ipsec_list)) slave_warn(bond_dev, real_dev, "%s: no slave xdo_dev_state_add\n", __func__); - spin_unlock_bh(&bond->ipsec_lock); goto out; } - spin_lock_bh(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { + struct net_device *dev = ipsec->xs->xso.real_dev; + + /* If new state is added before ipsec_lock acquired */ + if (dev) { + if (dev == real_dev) + continue; + + dev->xfrmdev_ops->xdo_dev_state_delete(ipsec->xs); + if (dev->xfrmdev_ops->xdo_dev_state_free) + dev->xfrmdev_ops->xdo_dev_state_free(ipsec->xs); + } + ipsec->xs->xso.real_dev = real_dev; if (real_dev->xfrmdev_ops->xdo_dev_state_add(ipsec->xs, NULL)) { slave_warn(bond_dev, real_dev, "%s: failed to add SA\n", __func__); ipsec->xs->xso.real_dev = NULL; } } - spin_unlock_bh(&bond->ipsec_lock); out: - rcu_read_unlock(); + mutex_unlock(&bond->ipsec_lock); } /** @@ -527,9 +528,9 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) if (!bond_dev) return; - rcu_read_lock(); bond = netdev_priv(bond_dev); slave = rcu_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; if (!slave) goto out; @@ -537,7 +538,6 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) if (!xs->xso.real_dev) goto out; - real_dev = slave->dev; WARN_ON(xs->xso.real_dev != real_dev); if (!real_dev->xfrmdev_ops || @@ -549,7 +549,7 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) real_dev->xfrmdev_ops->xdo_dev_state_delete(xs); out: - spin_lock_bh(&bond->ipsec_lock); + mutex_lock(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { if (ipsec->xs == xs) { list_del(&ipsec->list); @@ -557,8 +557,7 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) break; } } - spin_unlock_bh(&bond->ipsec_lock); - rcu_read_unlock(); + mutex_unlock(&bond->ipsec_lock); } static void bond_ipsec_del_sa_all(struct bonding *bond) @@ -568,15 +567,12 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) struct bond_ipsec *ipsec; struct slave *slave; - rcu_read_lock(); - slave = rcu_dereference(bond->curr_active_slave); - if (!slave) { - rcu_read_unlock(); + slave = rtnl_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; + if (!real_dev) return; - } - real_dev = slave->dev; - spin_lock_bh(&bond->ipsec_lock); + mutex_lock(&bond->ipsec_lock); list_for_each_entry(ipsec, &bond->ipsec_list, list) { if (!ipsec->xs->xso.real_dev) continue; @@ -594,8 +590,7 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) } ipsec->xs->xso.real_dev = NULL; } - spin_unlock_bh(&bond->ipsec_lock); - rcu_read_unlock(); + mutex_unlock(&bond->ipsec_lock); } static void bond_ipsec_free_sa(struct xfrm_state *xs) @@ -5920,7 +5915,7 @@ void bond_setup(struct net_device *bond_dev) /* set up xfrm device ops (only supported in active-backup right now) */ bond_dev->xfrmdev_ops = &bond_xfrmdev_ops; INIT_LIST_HEAD(&bond->ipsec_list); - spin_lock_init(&bond->ipsec_lock); + mutex_init(&bond->ipsec_lock); #endif /* CONFIG_XFRM_OFFLOAD */ /* don't acquire bond device's netif_tx_lock when transmitting */ @@ -5969,6 +5964,10 @@ static void bond_uninit(struct net_device *bond_dev) __bond_release_one(bond_dev, slave->dev, true, true); netdev_info(bond_dev, "Released all slaves\n"); +#ifdef CONFIG_XFRM_OFFLOAD + mutex_destroy(&bond->ipsec_lock); +#endif /* CONFIG_XFRM_OFFLOAD */ + bond_set_slave_arr(bond, NULL, NULL); list_del_rcu(&bond->bond_list); diff --git a/include/net/bonding.h b/include/net/bonding.h index b61fb1aa3a56..8bb5f016969f 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -260,7 +260,7 @@ struct bonding { #ifdef CONFIG_XFRM_OFFLOAD struct list_head ipsec_list; /* protecting ipsec_list */ - spinlock_t ipsec_lock; + struct mutex ipsec_lock; #endif /* CONFIG_XFRM_OFFLOAD */ struct bpf_prog *xdp_prog; };