From patchwork Wed Aug 21 09:04:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianbo Liu X-Patchwork-Id: 13771098 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) (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 26F7819ABCB for ; Wed, 21 Aug 2024 09:05:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231142; cv=fail; b=PPGWzRkhj9+UwEBQeuQJapvyOvzIGakabSxmMbPH4zI4mQn8mQsYIzs5OrUtGBRA+5fKVsXTAOufGyofWwl/54/RTS8XzTXC1yuGVGtpBDNZmAMV+feFhRJLDAn8m3BiXxGthDsTKv4WC3sn+7RKeP04gFMQIHZLox2dKzEcaN0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231142; c=relaxed/simple; bh=1fsVwhwSlDJMUzO8E6zzTklC/832QnRObS1E2BKYRHE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U+7uvGMc9wZbVgIOUIocpDxX6kCB8604WOFP/tfCvig0Qf4Yyz/dXn3otCtjrb7H6zalvvfw6n4gzIIVCk9ELws6YW2kxtxViSRQ3jO35zkxyv3x3TipS7j6CGYPu8y1/5R5ohvNLmpZUf5s1V7jY7sSPo6ODM/kDNwiYNjuJsY= 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=kPxaofK9; arc=fail smtp.client-ip=40.107.92.40 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="kPxaofK9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xtP7iY/vpPdhDQ+GQKsMwmNAgnRFJERtQJK3FqdzxQ0ze1xAWOmQqTXF5pZRXZuNLZdkZvps8MYRmO7vLmsmHayDtJSwXzkQK/C9XTF2hZ6vnZTCVZPrlAwwitCaSKI1MuaTT4SVxKDQJrELRxaOlFacqubTOnIKqPTU9PjXFPT+CRAbYuFLing9otvTV61E2iO7aTCj6acCXn/Ee8ou8efnr92tJaFYn+2gGlK/uIimFjylEqZazCB+HkNG36gUuGxdfBzThXmxXdOkAcUMpBu+QFchryo+/49TRsCQ1DdbRi26dt2RKBSKvysDClc7Yyn/vx9X6GQNp4uIMLpfbw== 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=CjoXng7HgutpG1x82wGknrqmu/DK+zjrdiZBsrdgOo4=; b=FzV6lYg2W0M2bejmMslz309wnO6n87kQrDjmCtr7XU8JqrEiQg5W7ZePgRHnVDAAtusUou7y9e6tOdKR2M4swmjBltCKcSWS5g2ZnKem8mPaOUcpp0laP5eljvMuzx5f7EC1C+ChCg7Rldz8lgoC/ai0HJj8f/k4jGySZP50KWYopY1DJwmFbpczoqAmbmfNikvsUiJTL1yDl0yZr9Uyc/jMNlyzVSAV6oc6Tj65zvapaBT7hmoHQ4eshNMIZ5zhBzmjugpV/y8oT2mr0NaOBkxmJRrg44IqMf4XdQB3fe/YsSuK4tFfcvI6fwYjfRP2yhabN3Jm2ZnPDG4hnazByg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org 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=CjoXng7HgutpG1x82wGknrqmu/DK+zjrdiZBsrdgOo4=; b=kPxaofK9pxLKSgacM22eeFKheyg4VR0iEcw0YerSSuXzdgOLrSgk96SYQxcUZcRqE6mmt4G3t2II1ZW8OIcQQdLdoTHwPretfSABlAyvpa1Z88lAzVa11XCTbQvcJh7m/WvqCq3aPu0Sp2s5KGp0h6ZTgG09WguUXcwudElHY8ObqIG8ovNzthX86G61jHdZxJNoJA3Nf0GhzNv2PFBF0QyKJwJGl7+Dn542AQQ2HpIQa/wfvDgawFr5Dcvva/IGRUJnk1z9Xbx6TkktFwGoerwijqr76iAOYduaNPFmZr5f2a0J7KLPHbIiKst7rUnwL1TZRDMfZ2ONTXzDRTeyjQ== Received: from CH0PR03CA0405.namprd03.prod.outlook.com (2603:10b6:610:11b::15) by IA0PR12MB7721.namprd12.prod.outlook.com (2603:10b6:208:433::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Wed, 21 Aug 2024 09:05:37 +0000 Received: from CH3PEPF00000012.namprd21.prod.outlook.com (2603:10b6:610:11b:cafe::62) by CH0PR03CA0405.outlook.office365.com (2603:10b6:610:11b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 09:05:37 +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 CH3PEPF00000012.mail.protection.outlook.com (10.167.244.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.4 via Frontend Transport; Wed, 21 Aug 2024 09:05:36 +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; Wed, 21 Aug 2024 02:05:23 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Wed, 21 Aug 2024 02:05:22 -0700 Received: from mtl-vdi-603.wap.labs.mlnx (10.127.8.13) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 21 Aug 2024 02:05:19 -0700 From: Jianbo Liu To: , , , , , , CC: , , , , , Jianbo Liu Subject: [PATCH net V5 1/3] bonding: implement xdo_dev_state_free and call it after deletion Date: Wed, 21 Aug 2024 12:04:56 +0300 Message-ID: <20240821090458.10813-2-jianbol@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240821090458.10813-1-jianbol@nvidia.com> References: <20240821090458.10813-1-jianbol@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: CH3PEPF00000012:EE_|IA0PR12MB7721:EE_ X-MS-Office365-Filtering-Correlation-Id: 534c4463-ddcb-4c19-040a-08dcc1c06c09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: AAB27V/AJt1wk/dWnZ73EyWhnr3cz3DXAmqLBMWtDwPOXwz/E2/oHu4oylpoMoDwX8k3IYEQXkFueBVKSV7C5an4RLkI5H9mhxorN3a0dJFxjCCB5wukGAJ9X1wUFxV7RyvNrLtdCC7LnBM4LrzJ7lkwbODBR3TzsMwNiAVAZBzj43w1Bknab9TYOG64vGguUJjIhGYWRFQs06No0GiIv5jFB8D0hyYLmzdgWuVFJyAK7PSSWCyeZ4MsTrDGVIagscYAo8prrwje637D07gzQLi8HvEkzJivaUGsgP5UCfWkZM9I5pdggV/PNrjLV4Mib2FY70L4E1rpojOegnzbAMPVRv91g6xc1bfJ8K27hXPqquzSSw131t/sUdsJIQGugFghyBb62MoeQdqr4JEdwp2f2CBvS6303A34twcsG0FUQAA36RobQP3tM6ipBBsyPkNlUliJM7uUlES4BahyO60llI/LUow+oxdCTX2kDFjUgtnVlA6NRDUwjQcUqc7xFaccmzPGHgqAh656L7zKNEzAeZjVL0m5A99xsLYQrchUBkgXWSIiv4ZYz2wwWOaYX2GP8gLAk3EQPGZFpAVR5kD3UjrPrCt2Ejuw+YxdWCDT2lwc635w8u79XlhwPlhUj7YyfL5fGv8qJ3NfBB70n3rm0PsgSblTAlrj5vwnPuzYi89G6RyL73wPnX+clj/6QWhavLypRa8jWpQYUZyCMOYTmBbBUk88XdMFjtrhPmW9+ge/K+R+J1khxTALoT3h+9dTWVHVKRcddlr2CACwCxbYAZA8CqwC942Dfi1SYhAOKWLNCmWcDXlOZkLHIL/s69oIsfOUKsvV/OXVXpQg9CordlXndT04yZzrnj5PeglYUgkvV7HMgSuDelFjVVsl2Y627LffVdBdk9msreykd0jEgxn9oaNAhMPiK2+PVyT5hy7GMwIj/K8bE/5MlBQ9+mb4VnCH8nwwLqHR/V/QGV7ziiKohJapR5heifjXyYdgex5Az+exFk2Cc3f3WcINceyvS6puAxnT1IlWc0qlR0zSarJE2clOhIlQTNA89Y5UhPuK+hQGQbBDgz7H1ECGFYTKH2apJyxn9ASL9PEgDSM4rHFWF67RZuupXDlejD++cKddYgSycXWQyt4G9CaSVVdfTB3ZFd+I0fYrI01oLdQIFi5wTU95a+Dm/wEPrtX2LqDVq1RJmvOQ6PXvAa2I4VcaXPRSREkc0CH+p3+nIhdb4EBZv87edM8vKlom+MEXw/IbkhmSbhKBflXbyFHYPoQTU5C5uxE0czBRsksgEtW8m84NE2LhmTasWEP9BprnQBTrYnBSgncEC7AKYuSjXpfCC8C/+/zZJo1RH3V70mGpyz+1QMOdkssIvZ1gx5RT01dclrU327uU4NmVIUG7yP5d76v2n0jCwkE5UVtsAp1siMe4YYMRsNX8mPwfi6WpKaT+bHQ6usXutoAHfWLQ 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)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 09:05:36.8617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 534c4463-ddcb-4c19-040a-08dcc1c06c09 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: CH3PEPF00000012.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7721 X-Patchwork-Delegate: kuba@kernel.org 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 f74bacf071fc..f191a48c7766 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -581,12 +581,43 @@ 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); } } spin_unlock_bh(&bond->ipsec_lock); 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 @@ -627,6 +658,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 Wed Aug 21 09:04:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianbo Liu X-Patchwork-Id: 13771099 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2042.outbound.protection.outlook.com [40.107.237.42]) (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 9EF0619ABCB for ; Wed, 21 Aug 2024 09:05:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231150; cv=fail; b=T9YsSlEote3nnug65EK+GIGajRCJ4Lnv2X0fjYywucfclNXxGZ0fWTtCfeyv25kKkvYLuvwUGnexsbLiv+Wlg8JRqOGW3YQxMfkvocR8HP+7dK6MmsXhISXNXp/8OO+3D9EW0SFv5sGkieBteM0qQ87+NkUuqs0Hdo9igqyWpbU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231150; c=relaxed/simple; bh=UArijaNlkkZA9WtJPXFEOj5wJP/hMr1zn1x4eQ07aTE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uonA/T6lrRJUE1qNQgUuqOHPYRNBi4BydmuD+ZdrN6dE2TCKKec+JtFQEex4eqUgdaIdPKFmCWxzVWRXOXbiJSkp9lLZX+lOXTYs/PaVfzhUuENZdq/bRjDAElNUUFyX8ppsFrM6BxUsjO/43peoNbzyX4iRTAP+WN4FaO+8ba0= 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=HEFrqtDK; arc=fail smtp.client-ip=40.107.237.42 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="HEFrqtDK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IvANjK8o4fbdYt+n6sdSTIkNJ22ObGSe3GwPD9+Rv44FgNM+Rs7prn6qu0jSOPEV8gdX/UI55d4msiFbkInsk5FSIcmEjpmfqqAQp8l7bNO+5dfM7S2MGefPxDtVtQJJ4iHgAmJRDsdOZI0bUIkgxgU6BjEBBFw8wrkiGCB4qrHeEyfYCE7L9+8z/bBc6HSVEDzjm7A1JL2+bsHcHRgEl7CJG64lsLgFr8T7M8A3vm/BlScNFzgsraUxb+VX1SKkOCWJyxe+8xkaIlOxTp2TqhGywm7vomSNgFtVnY1CFFFqMlay8lOcVCCXnTZdpXpLjS3z52eKnDxtoUvzfKf79g== 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=54PR9Ilo+GtlMgDbbPMzpb3bt10aWnPez/OQG1ac7Po=; b=gl095132AxXqXMVpgiaCQsqFricRpx6yYrt0mLcTiBIRT8ws2KF0nT+d7zrY6CG5kjQqb2kYXIAaXw0BfZWNz0DLAoSyPEOMDlX1dcRV4lqkuYkQdg+C5ThJUsAqEHlOAft7tDD7GlCSZFRVe9jvqKO4TgPk4p/2mYh6Lq9zP4CT6KzRaUOlwT2JT3k6azU/S2DeLddkWx326khp3JaYM6r7bT2zcht54JX3d2I0X9MrerSHQSthSRA659JFEjODZAWcIulZbe4USMgFBWmepseopN9zwDjl5qTjmY9ggoOkCAGatYZ+skGnT1hjKxG7Ae4wrcjB6PqZX7cVQqeq6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org 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=54PR9Ilo+GtlMgDbbPMzpb3bt10aWnPez/OQG1ac7Po=; b=HEFrqtDKQKJSOGolh2gr7yGRREmOOwq2trL0lMYLQCwVP6TNJ4pKGtd856VGhq0j3z+qKwgUnes/dKkFlAWp4OzyO0ESxqyS+q+Seua+nH5r4PWKk+35FsDrDpzF1Agh1EGvyVwMjrmZEkZLVE/62OpkwU/UGTirsuUZdq7PmoeBPzHZrjsxclhBNMPUlqODfJEiEJeGaZwEOCSrNyLJ3YAV/vNcbaUm++UD0cTVpQ4iwdAv0csKgioOuM3U/yZNI2QYh24acaB7SX+rIkPTi9tFiu74XxHeDYf5WvrhH4k/RjYhDfoUWmsPpOhfP77GAV9gCtkpVU5BAwqF/f2FdA== Received: from CH0PR03CA0100.namprd03.prod.outlook.com (2603:10b6:610:cd::15) by DS0PR12MB8197.namprd12.prod.outlook.com (2603:10b6:8:f1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.20; Wed, 21 Aug 2024 09:05:41 +0000 Received: from CH3PEPF00000013.namprd21.prod.outlook.com (2603:10b6:610:cd:cafe::80) by CH0PR03CA0100.outlook.office365.com (2603:10b6:610:cd::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 09:05:41 +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 CH3PEPF00000013.mail.protection.outlook.com (10.167.244.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.4 via Frontend Transport; Wed, 21 Aug 2024 09:05:41 +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; Wed, 21 Aug 2024 02:05:27 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Wed, 21 Aug 2024 02:05:27 -0700 Received: from mtl-vdi-603.wap.labs.mlnx (10.127.8.13) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 21 Aug 2024 02:05:23 -0700 From: Jianbo Liu To: , , , , , , CC: , , , , , Jianbo Liu , Cosmin Ratiu Subject: [PATCH net V5 2/3] bonding: extract the use of real_device into local variable Date: Wed, 21 Aug 2024 12:04:57 +0300 Message-ID: <20240821090458.10813-3-jianbol@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240821090458.10813-1-jianbol@nvidia.com> References: <20240821090458.10813-1-jianbol@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: CH3PEPF00000013:EE_|DS0PR12MB8197:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f027989-3a88-4bb1-0e4d-08dcc1c06ed9 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: 6ePQW57S+IhWF8pKvIp6OBTNke+wA9+n47kl64w/zM1qZlhSTOmjU0l0oA1m4gmWRBM2DF1kwKjfySgULu1nLyosXMFDvH+xKGtQMLx8/Hm+22KQppHGychaL+S94h5bcvAbkYKnfuWGWMC3F3pA4hjgrqW/8DYT/lgPef8SCKTTm9MKiroPIstdppBOIkJueU05dSmrq6BSVC9zKjFc/MKAeL8IQMwySksrkObJp5iMqOlDm7F9zYJ401GYFdPTXzo9YARPILObUpdz4A7FduE9qzKByUPjKamsihThWvTjho0RS2HeVfHZ1lPRVQr434wQ9JBeZLGTextj2srP6yHSzwNcTtk0JXuQ5QLmjNFJvZla+p4Z50C6/CLKfAb0v+jENrm58G0K0J6hgG83axztXQ9PeRLCClI+bEH5gI+aIiU/bsBJd/zARKShPqmsHYNHgdSeGAiD54m/EtL1cokHNNvTw0RHjf1CnecmIydEOlOndOrfNOHyWB0u8Lf6R1EALWvnIkdop+rzt9kJjdDsudEZKP5jHKuwPszWNWtvWWd2jqP7+ybJnvKW3YKyadIgU8/ipRwB0kqx/in5TDQncsXISJJbS2bdj+zc0FUaeaty/ViK5NCvn2wecqIO4siIRMBQ+Dztdg+HHq3cAebNdK7bXq4P1qZqTe+ovEE45wGLHofOfNOz3ziKchFQbWogAWXdVyNcn3ajFSiykvrclLA93F2Qp0Vp/Qpb0ud8XalECSUFi1bFh7lUcihjt0MgptfoJQQStFY1zDjDVQ701keEab11NO8agH07VUJu6uXzeIV2GGs++y+iR/S2K34XOroGAwuO0gexy0vbbcMnM+CUFxMivhIlMoF6qtJCLgo2KKd8G/dQXgE2t2gAFKwdlwbVYzVcAEHMApPYTWnOSgi+C5TTwvCMpUxzLX9NS8hVHxC8wND+B4RcC3bcQxXCGIE3aOiyQ1+ngaLWAO459xOipl0kuWvYTy0++OU2EsMiW9XeJX23dYdTNSpslbqX3UFVJS62EvocXOe2r+HmyQ4d8Vf6NRUxNDKzvDeVNAq7hUrepGhCwFU8fjAbYQyvFcyCyLJcBY6troIdYyPM4C+XmzM4mR/BDNrgHfr7DBiJIzdRtlIrRmo5VSnXpi61ahiNcNRvIMFYlMRCTPIACV9WQq1ag67FEIj7zQWB3E83B9wPMts3QMC6tcFERBrPzUPPrOUvm2BTjZLAOL+yh/qKZlMIkX9r/I+HcWlGlAhbk+ilkK7m9+q7dp5QW/OJl5mK6NRo7XdYl2f1YpzzvkWgn1P+vwn6laWmIBkRVHadR78DFWHv55J7KYGsc1Z3e4ly6gDX0LgnydzswQKOxeXtRouUfoDB+5ZSFTzkQPO53NJo+30YluECbrnr9FAnTibOhOQKMhPe9V7KfsEapag/TYRDH9R8xBYN+2lWL7EVVVQIp1Z7QbBG9y5u 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: 21 Aug 2024 09:05:41.5649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f027989-3a88-4bb1-0e4d-08dcc1c06ed9 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: CH3PEPF00000013.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8197 X-Patchwork-Delegate: kuba@kernel.org 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 f191a48c7766..0d1129eaf47b 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); } } spin_unlock_bh(&bond->ipsec_lock); From patchwork Wed Aug 21 09:04:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianbo Liu X-Patchwork-Id: 13771100 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2071.outbound.protection.outlook.com [40.107.220.71]) (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 571D21C2DCE for ; Wed, 21 Aug 2024 09:05:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231152; cv=fail; b=GkKZDPocRUxVu7oj77YA7ajRlX0APlKfuNuJu6HcTaPiGAWCn44A/CKIQiT0EMFDMbQfjpMQDm1ynTLuGhHG8l2qEaOIVMuUyKTqACwYJDbr0bLgSiPQKv9dEUt+MkMuuMyf0W1bzRJoA7RikdeDvgK2l2xcKe4jHigCQ9+lIYc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724231152; c=relaxed/simple; bh=bH/o5+m0N8MSEFIIylJPH1XFsxwRfvprnPmZdeWKd3E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a7OBCA+bvKvZ0yhyN230XHMLFSz248SvBj97sT2andsnWhZze8ZaI40P5RDSArqvjfrl9z+vBpMFruNaHdaTZIPwLbAChY11T9hwjmKDAPa6+Qr5rruKyuDcTX8o3Or+UmKuKt8vUMa/HNBpA6Gol8rFsPpS5hbLp/XT4pKicPU= 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=OtpplCBx; arc=fail smtp.client-ip=40.107.220.71 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="OtpplCBx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Kh9UgHj6Fgut4W9FYlq7k/9kOPGDOIURe3rGK5/CQgci0ydsFPw2P6y4qlbSjC7tPhD5jSn7DaerigdGre85hJ2DtfWSsP7jEwEC3QdPswzhAImqvLOktuoga3ft62B7jD6dbz348PH7ZbvowSFjHBsqFu9GlvXOee6YmkC+645GsNpdGpbG4VTVG02hIXI3fj0fDo0QPCXRm5OIfTCBBg2cIqwGVzX4AZTwPnh8nXSJYwGlol51HM/cvvrl+oKuVCQaI0EQYDaeS7VR6O9WfVYbJKMaz7mjENjKE8Tefrp5wsSNPO61ZTCOeGuZvxME2xQccwkVzJupfFGMQx4QaQ== 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=U6wOxYl0skvu5v1M2r5Tjw9IQqL5/9DjUD7DhrhNC4E=; b=wQleqPpzIMaqvbVHgc+0BFekgk6RXe4KZCSkUzGIK5TmbDMPJljO69yaxWt4NpyTBoqLkyW6IUBr4FYesHcamzGjjY4dwlt6WC4IpBEExF7HMwJWLAXHKgJWEBbCpWZhl/34jjVmBsPcSZ8LlBpTb2GufaCdJFTQj9FdLRa5DUIdIu+XXr0JL+De/Vl+aiPJO06vJs0ghvIqsXmi1gLwvcuAgyCRdnmnb20YfjYMfkIESHKinUAOvawORCEmVb/avj0u7DyR1EJeGvoaJGNOLxccsHNE8rG9jc5pZ9vxspn9qkTWIaJIaqVDCoN1PFlly7776SzaRAy9sjJkMuqi0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org 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=U6wOxYl0skvu5v1M2r5Tjw9IQqL5/9DjUD7DhrhNC4E=; b=OtpplCBxTSZdMCqjdxoLC7rkmUad8ggxc/kbHn3q6u64DhYVZkjqr8irLFQzxQtd4QfzXXOX91Ix6vrzY3AZxPIorqg3qk7cGIN06EYWnt3lc4dsoVege6CzTP2iSkcRYNPG8uq/SfI4/Wn5aoIaNxiCD9lPutoJfAuMTiM7lZn3XTfVh1uQ+vCJN5dvGdFgt4faCbE868zJN5qPfZl2xh0B/qmc0RCNnWOSQLMcfj7YhdsKYmYo/a/nFNZc2wDDdYAcHD7T/+tpsScjsyKJwyEIXD7ysras7cXp2qmBrV8aM4idJ40EedrXPdLDf1BtYHHAUpChKL8+Mr0QX7v+rA== Received: from SN7PR04CA0183.namprd04.prod.outlook.com (2603:10b6:806:126::8) by SJ2PR12MB8719.namprd12.prod.outlook.com (2603:10b6:a03:543::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Wed, 21 Aug 2024 09:05:45 +0000 Received: from SA2PEPF00001509.namprd04.prod.outlook.com (2603:10b6:806:126:cafe::b) by SN7PR04CA0183.outlook.office365.com (2603:10b6:806:126::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 09:05:45 +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 SA2PEPF00001509.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.7897.11 via Frontend Transport; Wed, 21 Aug 2024 09:05:45 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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; Wed, 21 Aug 2024 02:05:32 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 21 Aug 2024 02:05:31 -0700 Received: from mtl-vdi-603.wap.labs.mlnx (10.127.8.13) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 21 Aug 2024 02:05:27 -0700 From: Jianbo Liu To: , , , , , , CC: , , , , , Jianbo Liu Subject: [PATCH net V5 3/3] bonding: change ipsec_lock from spin lock to mutex Date: Wed, 21 Aug 2024 12:04:58 +0300 Message-ID: <20240821090458.10813-4-jianbol@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240821090458.10813-1-jianbol@nvidia.com> References: <20240821090458.10813-1-jianbol@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: SA2PEPF00001509:EE_|SJ2PR12MB8719:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bb6232b-0616-48df-7cf2-08dcc1c07109 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: ikzWjhmUijAvfYKHw7FEaALqXhwYS20U/NwA52oJIbfnJmlTSxN34DdT0QVkXVYTodWE29PwQSHlJtZ7qA7wKv97AkbLOk0+F92oMUUWLEe7awdLBkiP1IgDgCtmrVt9oDalH0VbAFoTartMOC2fxmYqhUTM9UHztZatw3IBU1tjWB9hlS1y8WiF4/gx5Y8MA1mps5mIiHuO7UJLtq7reGCyD9Sa31zYMV02OLuKski2SnKx1A7Wtod0cS61WCAXk38PxY2/yJM8IFqgaUA9ph8sucQrdtKohVZ3/eV1Q+QNBziIlDL2dh3bKGw1VI4pGZxGDcitq//IiJqJhtNaiIlvi0a/aBmwmBb/socvkcr8mqSHF0acNyfMCMxHZ3cPbQBzak8lJaV4CDW5LC0jGKnkavYmhHIj7/FIJKFx+9y5KmSydAlDzQmJ0gZTqW4mguWYpwiV5pnU8nQ71H2Lbv7avRngYqqD8LPwcyJgsNGCRnMQQ9IGn2/LklRB/TpDp8fbxmfrsrFSTzfi5KKdnfxjcXCCWWCN8wSEiwHl0tL2DERCcNyKIBBWuqq+EvWM75K4eHqGRtFHwNpzMGv/7EZBTWXlxy4rP59AGczN0XrgNFmoUNIMpzJu2QGFngEZznpJTvs5gsTMSkmfwocXNit8eh9Hd7jl5n/t+j01FPwRgSfyOMw+8Kd6zwzeJr9R7KqRDCEEPm274+9BnzXSKe0EPWijj/o6Bd7bTUA7JzI2BHvSF7746ilpxjUPvVobgkyMkjwiBSij6K/XqWHxab6s0i6zd0cQJVn0yWUf76dqAjD3bt/ECAXSQL2CuC21hd/y0t3tKqL/g38GXewT1T6Ldzs8kBxrju1RW7UJ6gXzQCQCo9cMINS1qAdYwFflqluLQTHfpkIpr+0hRMKi8ASIhSXRu1Uu3Or/0CpMSOkkWEK7A3sUZ3tUUPVyORPflkfcY7zsjMbnG75a48zEIkan4aD5mLKYCUsRhfATaioa8QszEipZihzYa1xydxtDHlzeeyEAoFTFkn9v5/qqKJ7bFpHrKkodAz6XJvunm2MxOBD+tqNmtg7Z+noeW4GRjfiD7WatWtouKhgvCZzuIzJdN5Ryg4iZ+9YAzRSIbZexjSWFWexD6Crs2O68QmEomS9T7GPo4Xkzs7Z2hZraIarr/yH5xrvp4uG9MhJj54WFsS9S49SHRzrjcuEnpxatDQ4qUvscA9cQMg2T/sbsZD0oSS1KUuKltYoR6yc44ptyH+6SDPHUBFRXRJilU7RSXHz94LvfDe1FDfB69Jt4Eh0CG97WjG0vJOwHJiJTwLN4bHBMCcQXxsDP43cMzUfZGHLbiAcN190DZkK9OhVKsFsBNRx29qUFRnHcxaHewXEvFO+tT1ftz47MB56azgYZxhMDV75RZftriyRW4AWmgGaAfwdNUuNI09MwLNP27Ysp+999/WWjX/B0IIhhGpil 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)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 09:05:45.2690 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bb6232b-0616-48df-7cf2-08dcc1c07109 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: SA2PEPF00001509.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8719 X-Patchwork-Delegate: kuba@kernel.org 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 | 67 +++++++++++++++------------------ include/net/bonding.h | 2 +- 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0d1129eaf47b..f20f6d83ad54 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,35 @@ 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) { + /* If new state is added before ipsec_lock acquired */ + if (ipsec->xs->xso.real_dev == real_dev) + continue; + 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 +525,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 +534,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 +545,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 +553,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 +563,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; @@ -593,8 +585,7 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) real_dev->xfrmdev_ops->xdo_dev_state_free(ipsec->xs); } } - spin_unlock_bh(&bond->ipsec_lock); - rcu_read_unlock(); + mutex_unlock(&bond->ipsec_lock); } static void bond_ipsec_free_sa(struct xfrm_state *xs) @@ -5917,7 +5908,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 */ @@ -5966,6 +5957,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; };