From patchwork Thu Aug 15 14:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13764833 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.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 1EAAD19DF6A for ; Thu, 15 Aug 2024 14:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731786; cv=fail; b=eTVQHcUqYUzNweAMFS+E7heX8cedBw4FcTw07tvSNyrqBaOIeNb4chQtRxKVwFsmEJJTaCbdrBbEKsVen3BwOlHUrmNKvbXgVh3ul29OSh29FYOVPPnQ0mj1V/fGQ2QDvw4fuQl2yhaBzbmyTPdGRUdZUuyJgyXlFe5mSOFmWnI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731786; c=relaxed/simple; bh=ykKP6b99iN6FoxG4mthILFG7JY7ySWjD0bkYCET3iXI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r7ecb3/CzkUFafv2PopiDngyrOsR1UGHQW0HkGCpTKrdhi/ueTwVCNfOi+5rEjcwZeRemlXwbVDDfv+EEl03Q5a6vhfyF5+GjqJUF7QxIJFFV39MVZDbMomb4IE7ncWb1GGk9H7nJc5G2XCEtnhrTLjqzvMOATWOiy5XwNuxBa4= 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=M0Gs1Bbq; arc=fail smtp.client-ip=40.107.243.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="M0Gs1Bbq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=quo4YHXAlWOkCMk+w4L5lRoMsu7tlWR+/1IiDzIQpnBglilU6G8EhgcR1GmvBW3l5z7roo2O2U2/YdP9SH49nFosFWmmKDWffWj9YFM5bsUczj4K940MVPB89oM4ifK1YJy/1dd13zfV+MywZvE9f5BaWnhiTaubcIGVBuwoQgKdxhgtLn7QuwcM9YZF0dEgiRvtdjXChDLgNKPzE6CM7P8yaA9Y1Q92ApZZ7Nbb6maPwp1Wn6LS9AKUC+0Dzx49lAtiFUpml63yICuQk34zbqoZ0Mzo4iN4jpGoUigaxj3JeMFIG6G4A3KVFLD7LPcI3Jlx4wtmPGIXwIX9scb6fw== 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=UEkD/UXq7/RnnUunKx478PLvbUrgojR2h43Ad6dIkMQ=; b=wOqzJZgvHbk0D8R1KxiZWLdgSWOi/pwam62ntXU+Wy0aGemAGaNWiKbVrc1OXDY8vmvdwuESYBRP1BjzpH80V5KjOg4RjPjmmcQL7x0m8DV6hEDD7z6+tWAwfqxtViu27W3nJ+WLK/pLQkT0+PUdq+Q9yCWmDmT4/gX5g5W5EP3pOr0QfVFK+ve6eDUazXj2hlKIEv/pwz7nVM0SiSfvGk2YAKdZ8c069JMv6czi0fJ086QdSK6fsW1TY9eDfAR71kcyqtOTiJwlf4Rw4z6YwKZ8ZyfJeqRZcN0N9NgdcYqmJ/td5Q+pPjylxwMnRU7It3p5fVwn0CkoGXkf3LDR2g== 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=UEkD/UXq7/RnnUunKx478PLvbUrgojR2h43Ad6dIkMQ=; b=M0Gs1BbqiiKoh9w0ayY6Go7Bk3eJHpSriFnLAp9YHGNQXJRREf88NCV0s3d6zotLP64LQIZLCYafLezRqwpyaMggrkgusdkHTtC3dUxriNQCRJyza9CHVC+71nWOZAB/K08eruFYKieFnFCq3qrGXrFwx0V/LRDYZBqFNv9su6ktxBRvgwhnsyPQ8iXcsTw8+Q33JNZpMJh3zgVVySTd+Rc/PdXRqjI0MAm6eqftTRfcYr1YxaNHCoCrpAW01LC/cAIk80jcP1SbQMYtgL9BuJ9vNxtKmU4qD7te8oiZoT/eWU2/xpsUCf7tXmK9RADALkkV+QnWJynjDnQo7pnfSA== Received: from MN2PR16CA0064.namprd16.prod.outlook.com (2603:10b6:208:234::33) by BY5PR12MB4196.namprd12.prod.outlook.com (2603:10b6:a03:205::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.18; Thu, 15 Aug 2024 14:23:00 +0000 Received: from BL02EPF00021F6D.namprd02.prod.outlook.com (2603:10b6:208:234:cafe::f3) by MN2PR16CA0064.outlook.office365.com (2603:10b6:208:234::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Thu, 15 Aug 2024 14:23:00 +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 BL02EPF00021F6D.mail.protection.outlook.com (10.167.249.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Thu, 15 Aug 2024 14:22:59 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Thu, 15 Aug 2024 07:22:41 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 15 Aug 2024 07:22:41 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 15 Aug 2024 07:22:37 -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 V4 1/3] bonding: implement xdo_dev_state_free and call it after deletion Date: Thu, 15 Aug 2024 17:21:01 +0300 Message-ID: <20240815142103.2253886-2-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240815142103.2253886-1-tariqt@nvidia.com> References: <20240815142103.2253886-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: BL02EPF00021F6D:EE_|BY5PR12MB4196:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c4bf6f6-71e1-4ef5-7d09-08dcbd35c3ea 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: GE2Yhd6q9/vZr41s1wtv9FWfv9yh5iu31kLbAnFTL3+3G67AiB1nZ27m2faFV3ZChT8xeSCsCj1M6iRhyebhYArUXEr1/0cDp+TO14Is1Nxl39y1jO51C1lmLw1IRYSeW6h09HHj5keteLL/MiHFsk1J7dECJ/JyaUlmAo7UjsC3WScyZqTJj4+D06gGWw9ugklClmEWdSDP7nHG2TMeuFxfVrcRFtokeAit5LPrc6RTEF/tCRS5U+JIL/CrCEWwns7lwIwvGVfmq5U0N2THVUYWaYXFc77h1HA4v4m8Vn2w15QHZ2PhG904vBWUB0titpD834fYY/Fua1YUc2r8T5NyhbSNsOgQMvniaVFLTMLgFo98l0swC0KUemCdvw4WZIjPLMkNzdyt5ERIs3spOXGL4KsZhYn+vGHZyrRfh5bVuFzgSP53vnIzuHep1Lt66ZZK4VCBwGSAbtVIr86BRMh727ualC6NnPuUGDweorTZNuIoPPwjyn+FMvGui0PdBnRRJUpe1EifKyYAXlt7q+oKU73AUd20NigCaZkInwPeLQpsxLWXxFC9R1R28ko7ZkV52mlGBLkiiUnZ+JR6KLcKqZW2jJEWGpVcTlbjTJZ1r4PpymQM5v850eOkoIXD4MjRDZPNvyBoEZcjxNaxTjObpfSSK/eJDuGz7Ss1GTvYWZSoWy8SjGNeLeIFJB/Cx6Dg9B8+Cn/++0QH6cKYumkUFR++0dVGgbMcQJcnnv5f3ReABzTw19tUp/YRM9GXWrDgeVeItalidUcQnmmXRi59X4PO1D5f6LdmCpHY3rAYA0JzSCG/vl6WHwtzMo17t+JHYped0JBYbnpHds3xkBtPcRqVAakclYCF1sn5kZgjA/tgIarpUFhg03D6jkE607yZTZauq0VhlrbAOIuRBwSvpOay4ZlOsGRATbxhQ8ZHTeesuSvtDj4iyfG6BWq3ctue8kFju8fuXyO5YXFjnzsE7knW1t2GawaIz793o2RzYsoZoG8u2pecxrfP1i98kikMBrPFZ8hOPWP8IVtv+IG4eYaWBBGPxDd+EOArismwIKboq7J5Moki+yL44LFwuN/XKul7JXdS9qZXBGL/S3kMdtfmK8yKtzrLeWRIaCMCQXNkxeUFs+4TQgeMDvvaWbMNaEHPpsmxgAss3B2VjaI3wJPGyVmYtPlGR5ItdCQ0a3MZxJxdvRwOMF0ljVyvD+DvvQ+KcRQdaIb8KhpUgES6IwlypnrnnQ59Mw3EgbXs3lk68immP9ccZPNuWspHYn6CZOheiEtKnTo4PHb7RehyqEpccfi/lHMg5k1/A5u8eEIsGzcKVds0CvD95OLmNiz++GnAK2cbcJAB//AbmyYuq305/dS593/4VPZoFf3bZAI0GOgLbEyLUpn7ECSjoiPm1x5WBW+ajlMBb1l/Zh+wgnHpGvYvVYz66vp/34BYG7CQJAeHTsXNYGpDqx2l X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2024 14:22:59.5577 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c4bf6f6-71e1-4ef5-7d09-08dcbd35c3ea 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: BL02EPF00021F6D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4196 X-Patchwork-Delegate: kuba@kernel.org From: Jianbo Liu Add this implementation for bonding, so hardware resources can be freed from the active slave after xfrm state is deleted. The netdev used to invoke xdo_dev_state_free callback, is saved in the xfrm state (xs->xso.real_dev), which is also the bond's active slave. And call it when deleting all SAs from old active real interface while switching current active slave. Fixes: 9a5605505d9c ("bonding: Add struct bond_ipesc to manage SA") Signed-off-by: Jianbo Liu Signed-off-by: Tariq Toukan Reviewed-by: Hangbin Liu --- drivers/net/bonding/bond_main.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1cd92c12e782..eb5e43860670 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,35 @@ 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; + + rcu_read_lock(); + bond = netdev_priv(bond_dev); + slave = rcu_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; + rcu_read_unlock(); + + 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 +663,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 15 14:21:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13764834 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) (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 7E3CE1ABEBB for ; Thu, 15 Aug 2024 14:23:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731791; cv=fail; b=qaFU7rbf0DqldgbTIm06D9KTkqBpal4u1W4es4ljs5Bm7LgIMLGeHLUcIogeFMu47XE6mIzGQdLmQE1BVByeJaCkk0mrKUGYu9C4e8pzD7zbW7YwGu1KZloLa/s0EWkBdsMJDCWw3FVW9PhkW2MAcvvpV3U0DA2YkwZPhpze82o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731791; c=relaxed/simple; bh=zWCHMdFBoMCzZmLhYJuL1RHS6S/vaxpeAOhB+eZN9H0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T5Y/Irh2s+pNWxc2dwrUppGzF0XDhbmgX+VpTvJmGTn2bH1TnDAzDgXfW97gSS0oyTmRwWguxLfULmKjaAUYsEewxsydSDcwsvUSeCJS5HvJfxWXJ206S2OH6fSxprYSlTcV1E2r70sA0yxPj3hdyRVQTckCRxnCDskHNnrrPcs= 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=ut3J93oI; arc=fail smtp.client-ip=40.107.92.82 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="ut3J93oI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BKwE7ZuNXhs6pphqe/IOp+Zdq4NOMhIrho+nvEqgmE5ifaZaq5KnSXHTXJMHFm76zRPmPwjO8yNCx7Vg4uHNVVYVJ5CiWYESpMRWbJrcxzDcsPlJp6u7rziqJ4hC1AD4bC5/e6N5hs2utuxX2fdlmc6en9eEe0f8PPqmS1vNNiJpyFpZVZy0Q3COrlTIL2qasEn3QCjIo6g1Qz3tmfVA3iOSYvtcYd0Wvlmp3DjIzf2EQqNDvhfz8YBidYFS6yN13sFCC0mUTcvoIRMZEzbFSeF+iinREermdXsRibCPUVM9k5gEkKqCC2JhzxPZwGiapH4sY6sqIXxh4uVKH1VE0A== 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=Xnya978e8JwPPBVM9L084/LJxSE38jwMOEF6C/6WvIk=; b=StZmLqdP7CyjP0qNjcfcs/A1dCqwGxSmsllt9RXIxsOTJbKlJtWLoaDI1XGTfC9aY+SG8KYCsl8VuPZlzM+G+5GLO+yLlorquxNsXvmIJ8JlhPaRRgPEyrYDNd1pFJmvLu5CCzcT3x2cBthpPY1iWYA9MXQAmhZxnhb24r1lr/EWjTACSB0A7VntbemZgF9T2OkwSbPb9LA3rY2oMtpId2vsIiCmvbTRLcu5hGJPISOayMH4Y7wwD/POYwQPUgk9iNFTDKCaV6Ke5tW/rY97Ygu/dBPzAYzVnULBkzdR6QtSWaXHtS+mH6vLlegMAub1dC5NfDsKsi5UK1s09U8Bzg== 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=Xnya978e8JwPPBVM9L084/LJxSE38jwMOEF6C/6WvIk=; b=ut3J93oIzJ2+A15CNFKf8OrGF+gQUmoWeXKtsPz9aqMvDHdi/O3lShLh6zR+088D3QzyRxXqfh64SBgrhCXDU+BiUdYUPghThUbvrjHgGqHH2u+6I9QwbsKBynyPRENx+8q+ZA5+s3dmv0g4MuUDnggA+Sge3OJnUO80gxXfrYAzyByLTFdn/d771gUoL9WVwFRzh1uVXv14/kO0b/UsUeSg2C7Aujz9NWCbsDveNMEwlU22eIcAxlU6GURUFud2WWOHXeqRtBbKOt4IBzbEzCPoKSV1zqSH15OMSy9fUdGUG6Dq+PfleiHr1LTCiBt4pCjpRNg4sDQg0VTOWhFOGQ== Received: from BL1PR13CA0445.namprd13.prod.outlook.com (2603:10b6:208:2c3::30) by SA1PR12MB7104.namprd12.prod.outlook.com (2603:10b6:806:29e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 15 Aug 2024 14:23:05 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:208:2c3::4) by BL1PR13CA0445.outlook.office365.com (2603:10b6:208:2c3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Thu, 15 Aug 2024 14:23:05 +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 BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Thu, 15 Aug 2024 14:23:04 +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; Thu, 15 Aug 2024 07:22:46 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 15 Aug 2024 07:22:45 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 15 Aug 2024 07:22:42 -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 V4 2/3] bonding: extract the use of real_device into local variable Date: Thu, 15 Aug 2024 17:21:02 +0300 Message-ID: <20240815142103.2253886-3-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240815142103.2253886-1-tariqt@nvidia.com> References: <20240815142103.2253886-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: BL02EPF00021F68:EE_|SA1PR12MB7104:EE_ X-MS-Office365-Filtering-Correlation-Id: 1291002c-313e-4bc9-8b71-08dcbd35c6ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: tXv4CU6XzRAV1Ss20W7DK6nFy47qK27tFBBDQujKJ8Ss10532e9YRPKIq/F4+q/01KHPOo4Jlq9/jGRmDpUUoCyB7svLw+vjq4QFxq1lsQvG/ky018nCu1cJJyF3jSH4UUEIJuSmpha/tv9pPO3/88/3MwwKX/fEaDIr3E98p42F8o3KIRXxyDIoByJtL6R8fH94ZfSGamc0yB3rn5htLrs3gZJiBi7S7dHLGHQSZidoMQTqhTiseA5ASsfecnhWt865ugNCCVww/gWWW6DgvqWc20etF57sqI33FgqRShMpAo84WHSd+A55QgYKD7CtWrzysDkzXayZjmvEnnUcgHhnNKZaGnS2aBISOkSR8Ut74iPxv/QNYGgKLBDdVCbLwuUys4s/PgrZTKZ0CXZp9+cAXWW/b8M9pRYtc0mK7JwOo8woKi8pVYMw4opBYj0YD/dWqCbNfKwHV74sQ875upd4mhspUOoBauXrG9zqk14zGV/f5up1oXrInL2xN2QI+RrWhdzYGuwFHRqwVJyQyAkQ7LP9jT8Z3jOOU8o+Vx3y5TtrF3N8bC/IOIqJX5B4LSKaGeNvdPCwdXaXKuY+/FWyw2JK0NY2lDMiODw2ouf0RkMY3Piz66ERmRjDW2Whs0hnK8CO7Pwtbxw2ksbdWYXYBIlOnV9ieouMJCJQimtj4pU7rQ08nZQA4s4B4XxVF6Y6HOonrbVlNCozEuQJSiP5oL6abQ1tjnfwkGtzPjLZB8L4DlUsTf3E6/AUTI8SqdYYgDK4TuS24vV33rEYDvWp5jZzcjP3oG3s8BoEqJqVPQpNdGrParBDIs+Zq6UvPa3bZXNn558wxuHYd+hakj0tCjkBgwRVqoO25IEJtukSX/l4CVxh9NxF0/TISl8QyGxkVOSlQtWoxfVZCvYsP2j35B1rMvQK1UUvZtjTEGdN0yusaz8svPGv5liIfPjGS40cAwo+PQhP1qcDDSDSHdeTp1uN/brnevLLiSdQoA+fb6Jl1uZ2V/JEZ0trafJEIUHb+Q+RxmSfOpPzL14V4NWlDASZq/ztY5W7qFyCevMK8fmSY2ATqmCthduaNWR3bYkscg3w0fEfEYDBeHsG+rHnXSEoUZGFka+/mSVydsFhijuPa+HIGgRKQMl34gUfh2N6S/tiLxYmkbODXIBMbnLsioY7OKhtdVgkVq4JJKCFmrmNpX+zcZ1g4oLlA0z5Nsuy6uy2daiQFMMKa69T09ZoCpf2/qNLiAhgrXM6jNQ7KYfvSFCy151QKvs7WcCnGc3jEp7RRLdYmXTIHFf86yS2tTUONofE1PBbnS8kP0pxdynB2w9OIiI94D0hvwsbcTMVlInyCwZ1J0YX8wPn8PoeqSzin9LKQMl6XQ6o9TPu5TZZyeLyyWGhWF79ICW3r4Zf/3/iUpPWPidaR9xbAWv1dZFno8PxgbeN76EWeFnaYjg9XIpqn55vIuHGrqcK 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)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2024 14:23:04.3765 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1291002c-313e-4bc9-8b71-08dcbd35c6ce 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: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7104 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 Reviewed-by: Hangbin Liu --- 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 eb5e43860670..e550b1c08fdb 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 15 14:21:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13764835 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2064.outbound.protection.outlook.com [40.107.102.64]) (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 310A71AC422 for ; Thu, 15 Aug 2024 14:23:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731794; cv=fail; b=GxkAke3q4/sunMfQvdpQih2Ie9TULYgPpBuZkcizoc3ODEupN4FPuHDn5Q+CA1+YTiI/L2/Vik4GF4TJbbas78jWw9CI9eZXbvGXqOFJkDpxAjmbRrgHbVrwDMi8Dn98Lm9ulJ24TPLgCtWkcL8B9TLDCYFSeHKvksuiVobu9EM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731794; c=relaxed/simple; bh=UjwwP4uVGf7GgxPXUlGzmvndlLFD3t4YMet3Sf3BlII=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kvcGYbqlHesMePN6NfoWFnOEf4ieoTwFER7C6IVBEDNXOKwaxFwXu/MUZDhv0R1ecYGUA5qcakyRJi9T+nsLI6tEkmxj4nIJ2RMUbZ9t36pXBN/C+hBnqNFMzQ/5/TSfKGeArwF68RFBzK/QejOtaDEREf/SbObs5hYgbygG0f0= 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=bIxY4JSp; arc=fail smtp.client-ip=40.107.102.64 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="bIxY4JSp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QV4jdq4BIc1bWUEiIUySMbCGTjHWWByjkxyu3uGQQ5DbNIa7tIrlTnW5b4Tums8QxNQARDzsLDSWS0JAiIKYm4tZS7jZ89bj/SuANeFntvyu3pYmhs3QuLuHGhCn/M/2G5G4fLACMYm5frr+ICHZ5N2ZPZdxoxnCfldIq3Kp8xCQLAX5SvG5T3l/Fn7y0B+fkjhFizTQOA9Pf1npxWubMOOKkR6a6VFzoWmbJ1BhjG9ZMKrrtNOH7HunPf3RvaXuY1vgjx87bjQV3CLXvyQcnSTnIFRS5gAqa/sBb24pjgTOCGxvKqrASOlw0z5YIftpuCtjdq0vWyUGVuxMorI9hQ== 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=KHvQbCAk+QWZE2bjEMdqkz/3uExHydua1QOUVd8urnw=; b=LMX+clig5ZCYyWwR0JlXOMtRAYvWLoSuCo0HaWz8VE7MtEDpqx1z0LUxegWatppZhtu8KEiOOqfeKYE4bsT8kCJMkyqyStQP/dcFkNijtI6v8ttDBeUcgrOS2K2iwG94+2zX+w7WQnAQuJygpROR0MhKOHSkpwA5XMGX6k8HTKWTn4+bYiAzC+2fFDTS3n+3ke0Q4qsvfUUAPb344BeeKF3XXOYwMAuQWmtBOZ5XfDvCFnRyTrcJ2bGkd1zuZDiER6AnLOoAkjbYVGOsmPsDa+OZ0Ca2VdOJrRF9zXdgqSfocvZG72B42+5Bk+nM1h21QRQUTCBVVlgMq2MPA4krTw== 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=KHvQbCAk+QWZE2bjEMdqkz/3uExHydua1QOUVd8urnw=; b=bIxY4JSpS43hFogh6EvMZOiloCFbkMwKzoMUkUmQqqlOcRThhjqXJ0wdljhIozENa6/5bhT5Y6d0iufl4eYJzAIpuoOddQVE+s8NUkM4WRaaUeJ0sA8LESqmuMqNlBj7KZCFQVdy7H4FYgLqxVhwf3/6abSnbtRXq8Ez2ttddFC9ORbWED8euc1O+Xn3JVjj7HyX73jYVKoflRmNndFU6CE0K7LmHcRgPo/bxB22FaLU/gjR7jD7W9Gc6XuGOySgHuUM/dYfBdeCdgpXR7CPhK2BwvN21PwdHMPpz4kVhaL2zzSNtF4AIhzY+75JeUB5Utsw0LD7qB6iYm+7ZCVTQw== Received: from BL1PR13CA0436.namprd13.prod.outlook.com (2603:10b6:208:2c3::21) by SJ0PR12MB5636.namprd12.prod.outlook.com (2603:10b6:a03:42b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.18; Thu, 15 Aug 2024 14:23:07 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:208:2c3:cafe::4e) by BL1PR13CA0436.outlook.office365.com (2603:10b6:208:2c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.17 via Frontend Transport; Thu, 15 Aug 2024 14:23:07 +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 BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Thu, 15 Aug 2024 14:23:07 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Thu, 15 Aug 2024 07:22:50 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 15 Aug 2024 07:22:49 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 15 Aug 2024 07:22:46 -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 V4 3/3] bonding: change ipsec_lock from spin lock to mutex Date: Thu, 15 Aug 2024 17:21:03 +0300 Message-ID: <20240815142103.2253886-4-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240815142103.2253886-1-tariqt@nvidia.com> References: <20240815142103.2253886-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: BL02EPF00021F68:EE_|SJ0PR12MB5636:EE_ X-MS-Office365-Filtering-Correlation-Id: e2adf321-9ee1-4805-2824-08dcbd35c891 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: FLXhRvNaETsZQYCUt9OSiqWnHm0rmcZfMh7j4cgKV6w2ezBR6FyVOK6np0AkjvtOmaLEYsFTXfznzDEZvceW9zqxbwAMOVbJn3OjssqAlWFLhnorUv2dv03AozP0Ppxiz7MGKgj3OY5dh7wBPdNV6SGf3WPrTP97bZN1t8xAR2KuLxpqHf18z2bCC+PsW+kuguzbzKaWj1ICCkDrSN5rmvzT0DdRxurEif0V27+TADwxU6Qzmn5b4gtCFN/NhihWXYz5+QlMLEwhKWC5Y/4Ia7U7tUqkY9uGVT7+wwbX/lnZ7IUQtAu/IgYy4gzVUucS6DV893F5qsO1OrTkYkD+tvSBK6blIQE+s9gHRDe6cQXmuYEEWU3qi+rVFeuRdtkZp/GbLm/+Owbpcyzt3eqRSmB8QkEGCOQuo6l+gX7askB04VUixVq5OIGYM/ne6NAI350iE0mQW7T6Eta/Twu/SuGodwuvK7ZGwaCkR7gvORQktIHAotAqec75yZ9dQWG+IS1aYbwWrYPrvux6ffGBoa5VUNOyUZo9vKTA+0FHagM43MjZ3CZP8ycjaLDCI+pVnO9fEGyHlg2bhhpxwi/WUGrUnlsARyQqUlZIx5rNa2IgaDKrAIuLpTW4mMTCaSQjoxFoyR+ANYq6FIBgIoJbT6LxXxFPCe1M58gRtkxHV/KaCYaF/GEj/LWuWN4QWMG0EjoQ/ganbrfQNBnzJOf9UCi08RDqtCDXcLiPhOClfaoDdZ4Nx3jUWTjuaenETXwqkCKZf9aYQB/zHdSzJkY1lDSCsztdq/TjXb8KVtvFNohl2AyVbRirktLAPOva/IOn1yd5iG4UCVglULnqCuasuCTtp/7t8Ow+v1cWX+GcUrLHL4mEoRWDDTW4uzOGumZh+TotprhSWd6QTEag7kh4t2QZmaPygaCze9OjetXWI6HvnMcXey3nnceRrafha8Zw59CbKcj4LeeYEGyk/w0Nv9BFR4mm9uY88tOXZU9nI60CuTR4Nln/CAWDjC+LetM7jqkz4K3LnMtc60gwopboGoRSbhm2pfe0ODknVr856mCYO2eRMUPoYm/I9ubq0rQuVOYlNze/sctiGE64N7/NnttJsSgIMWBXVsS4EfDNqNHerWBHj+GveOxNSWROlgQEm4Fw1MxzGT+0qRNLuYZYLbBFd5tjkDmcylRoSQ4L3a0o4WXsoVNFDLg3hMRoDZIGxBOUHORrxb/X1wTZpXrbzz+1Muj0FOudxZPbSdnaak5wfkpwmHlDd05rp7WceXEjz7ByLtf14JyjHCrJ6kMXqD9mTMMwMDKh/fRzQsaeotre6YArfTjQxYg9vJ/oZ/ODfRqrR4XRWeR89/xJ3Dtaq0Y+Ao1UY2uD+0nXXEXcAcWpjLMt/2Jkf+QhKzOwMbojkc+RHjZBfiUf5UOw1fl0LzYPWxq7cMOYKQsdQfsnlPnqHcdjzrG+a6APxiM/QcIW 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)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2024 14:23:07.3609 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2adf321-9ee1-4805-2824-08dcbd35c891 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: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5636 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 Reviewed-by: Hangbin Liu --- drivers/net/bonding/bond_main.c | 75 +++++++++++++++++---------------- include/net/bonding.h | 2 +- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e550b1c08fdb..56764f1c39b8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -439,38 +439,33 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, 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; + rcu_read_unlock(); + 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 +476,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); } /** @@ -530,6 +533,8 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) rcu_read_lock(); bond = netdev_priv(bond_dev); slave = rcu_dereference(bond->curr_active_slave); + real_dev = slave ? slave->dev : NULL; + rcu_read_unlock(); if (!slave) goto out; @@ -537,7 +542,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 +553,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 +561,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 +571,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 +594,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) @@ -5922,7 +5921,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 */ @@ -5971,6 +5970,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; };