From patchwork Wed Apr 9 14:41:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Ratiu X-Patchwork-Id: 879482 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2080.outbound.protection.outlook.com [40.107.243.80]) (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 C6569191F77; Wed, 9 Apr 2025 14:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209746; cv=fail; b=GrMuqb9YGAJznfD2n5iFkVDoMXziDtOb8u0s7YJTj4SQXnLQ/tejIeT3Xp7g07nIAcXo1IM/z+35lA+ElUCW0HrBN+lXW047fSTpmexPjBTtJtrq9bYqQflsNZlA3IZGwrvpQtbRs5xDezssMHBlMta8jRg6rg0pCUUyilObRPA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209746; c=relaxed/simple; bh=E7YAMbh4rhcCrP8GqyO5BHfECff1nYTF5Hqcd6c1fFw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aobIDUc18L8tNEJAxWZRVXFSjm4jEN70L73NpKcdhwanyTDb7u0wvYWzaktH7oTIEsv4sLwV9cf35mASawYwEe0WoQDgGpPqp9/bqIaRozfwLoCn9rrpzlTqsqhaNlFuZ5GCJ+5YtA9mcDMt/jOsJCJfQI2Ev08xgWYSE6ZfXWY= 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=hW1/Mmnr; arc=fail smtp.client-ip=40.107.243.80 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="hW1/Mmnr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HRgPSxDUco8Z4wMlLNh8Ln3q6kCLIsuEWFo35+xnxHaC3Zvgv2kqfD0VfDykj6LDQXApgMWIXl5lJnYsU7ugzHzaULpXlxxbXeeYB504qhB5G9EUAwWlBacw9mP58PqnEQZybt7NWXmMQtw15n+SrkiTLnHjgBj2sEDf5jJXZKM2p7iw93AsQnn/PCZNPz8hGGRjQgswy8IY5y/a7ckGEiwXCrxkr0guCDUM9usWsO8HzGeZ7gvWkiZAdg4xMyGnif7oQD3YODhmKXBhBby6dzUO7mymKDVeeGd3o1EV6Bd22lx2rdPWnKjT+H4ceZW52EKSPM4P/mCrlFgD0885zg== 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=JeP0oeFT1V1YZfI0RbwA8wpecEhr06zGkLkr7cOahY8=; b=BDwmLeXsq92P32fLvvTRnufpsb77FLWC8A86bE2RtPhPWC0gDdBXiDLi383VGLoAT2hWD2Jdw6RwjWml9WWUWxbq4H5uLhkBICbkVR8n45uOq8xl+lLsbSQnHXCgGd0kdikyyNl+GC0KVJn8ywDvWPM9JlK58GUACzNn7hgYgytAMLVYREesNWfNDKObrSN0a0mIKLs5U3rjb1qnB/44wFOfldr9W7fIXFeYfkO7mY7AUaq/dlOcOTPkTlvHnbPCUY0r4f1CdNYqZ5RCv3vqaZVLCjZ7LVuicpWghXFFmutv5EiO+f8zHd4mcOgr8DFPsaV6mRyonXHhVH7ac14oLg== 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=JeP0oeFT1V1YZfI0RbwA8wpecEhr06zGkLkr7cOahY8=; b=hW1/MmnrjqFBhJS5TX8EfxWBCid7BuOicRvdWQypkMvvlOSa/kqnrrL99BoA6e/foSfW66og8VWbzCQp5xO1JGDUJ+BPEBeF+shLEXm4wldAraConMX/IIMXZBEmsODPKQJ118e7hi5F6PrIyAVt3k4KFqPZx/KWLbIhluTBPj4utJuabMOTQOh6u15STi382z09B1XLru2QXfMUvYESO812DsmGQBWOcq7EhOnqHpXNiBOCmW55KA7uWtEOwzD8IPjJulgyibpYUgRCC4WT2QZnGcGHr6o/xMkQdW2boNkAKvIzBP4JTDe/aSfN0v20wqY/zYhJTyW3HjLTgoc2sQ== Received: from CH0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:610:b1::29) by CH3PR12MB9453.namprd12.prod.outlook.com (2603:10b6:610:1c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 9 Apr 2025 14:42:21 +0000 Received: from CH3PEPF0000000E.namprd04.prod.outlook.com (2603:10b6:610:b1:cafe::75) by CH0PR13CA0024.outlook.office365.com (2603:10b6:610:b1::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.8 via Frontend Transport; Wed, 9 Apr 2025 14:42:21 +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 CH3PEPF0000000E.mail.protection.outlook.com (10.167.244.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Wed, 9 Apr 2025 14:42:21 +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, 9 Apr 2025 07:42:05 -0700 Received: from c-237-113-240-247.mtl.labs.mlnx (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 9 Apr 2025 07:41:58 -0700 From: Cosmin Ratiu To: , CC: Hangbin Liu , Jay Vosburgh , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nikolay Aleksandrov , Simon Horman , Saeed Mahameed , Tariq Toukan , Jianbo Liu , Steffen Klassert , Herbert Xu , Ayush Sawal , Tony Nguyen , "Przemek Kitszel" , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Louis Peens , "Leon Romanovsky" , Subject: [PATCH net-next v2 2/6] xfrm: Use xdo.dev instead of xdo.real_dev Date: Wed, 9 Apr 2025 17:41:29 +0300 Message-ID: <20250409144133.2833606-3-cratiu@nvidia.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20250409144133.2833606-1-cratiu@nvidia.com> References: <20250409144133.2833606-1-cratiu@nvidia.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000E:EE_|CH3PR12MB9453:EE_ X-MS-Office365-Filtering-Correlation-Id: 91b84a2a-3f77-4ef4-d9dd-08dd7774bc3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: Bh/3NbByT0ENbWJfjLeLXg9GHl3F3YV2SkcIjsdRqtzkGN1tp19JLEjpDdilf7E33qsQO1xJ3pmGEpTTe8Vzoqt1rqfAiGsZeBzTpGq5RtBbUNTMOKck4AX7zjbq4c2245O992uaVnREo4vGO9ocySMEtI6AWM3VmVAOk6XxA8Y1EwoCFYcGy2U3TfIkPIQBCGeeuMaSGhTytj/EBbVkY8rVHm9S9I772IzkfCJjSshOyykdF/AuowSE+Evg8AK9NgLM/9D+HHaBoK/9wRiTB1a2tgpWVtn976VKbKY5Pnbt1GvSCxnwIKc6bJ5+Gv+cMLIfNjmeDaxhGvzIkewNHWM4o2o7RC9wzylWE9ejRKneFj5RD7tMQ+t6GPSDNY/XBhK/V92TopEe+wPcY7UmQhSMXR+CJ0N2lyng0oBCr2odaner2rldrlG3XvZme28wIyrDGzdRi+l3KP1WAYRbQeSIMbgELUTi2udKrxEmv3LAMiauytURFZIEuY6Y+oh98EJkmSQ9LtcrkOS9xBkHK1Js1A6BZ6rUSrrlvPTbrA7KyPzXMq08gzxDATr5jSoisileW/2XmRPh8RYVgdoIVuu6CitjcePFTRELkp/AJqFRVuTKifG1s4DgVlQptfY88JwD62l143e8HCeLK7hnjKw2LSlG8pEVRczNltNCodKN8RJSsK4dqt6Ff+q1lS8C9YoVsAXHVSZN43B6IT9IK09dCisRfiOQDWIv/YOcwQJPeWQ32ji1CNmtEed4Mn6zTA2wd+zF0ZgUDd/g9nGYp/K+nyjqIokkmxH2ltnHGdZWWeRu1sappAEg5MgTTsYzH/hNnE51xf4eebE2n0YwP875HTUlYbjmAq7sjfP5VETNdlTCz0Sm4x5z12YRt1yX8QmznttEIcYycqkhAWfi5c+UFemgQUSBOSbREGCzjhZzwbxTKofEp0s1wG4cxU08DRyYAfKwUP0jJM4hS78PY9runbin94ohkLD6ZJkWoQ2gbpZQf2nihQRx0p2jU6XdXp/KjTTJrMNTJzCYqjIn7HnuCg5XasHmwZvy9W3uGCy7feCoAN9GLwpvlNFuxJjqDs7baR+EwlsvWGomhG6UCCN9Mdkt0zT3ZcMGRQdCrGe7k5o+R/kj/ZkjNJqsWLVbokH670GOK0DXahxYvpcjCHMZRZnbjtxWUb5RH3NSU9Rq3EWaWeJYpDOruhBS9gv+jp9gQGSUj+E7buz9UEQt1oBEp9ONnC9E0m6QqXZbZ6IvFo0RkWnZoBIdnLO011SBIOITm08i9qAbxRoIyXWUS2Zd5GtOLJP/XFQv5bs380iVBxAtvCtks7g6dxUyu1Kf9xtljPkJ02c5qfSZGqhD77K8KqDromMPrX6Lezb/0XgmC9vVezBOzjH2fBxMVVBOkkwO1W95zWW4Er4zqiTPNZqJKGOTNeKFhpsNoG+t9WuN0mk2ifc29XFweHDwQGJICJLWZSQo4Noh6rixkYDI/KFpJr7olA+qx4o8XNZxodcqqvcybsWQl631dvMTHuO1 X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(7416014)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2025 14:42:21.3063 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91b84a2a-3f77-4ef4-d9dd-08dd7774bc3e 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: CH3PEPF0000000E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9453 The policy offload struct was reused from the state offload and real_dev was copied from dev, but it was never set to anything else. Simplify the code by always using xdo.dev for policies. Signed-off-by: Cosmin Ratiu Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 2 +- net/xfrm/xfrm_device.c | 2 -- net/xfrm/xfrm_state.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c index 626e525c0f0d..0dfbbe21936f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c @@ -1164,7 +1164,7 @@ mlx5e_ipsec_build_accel_pol_attrs(struct mlx5e_ipsec_pol_entry *pol_entry, static int mlx5e_xfrm_add_policy(struct xfrm_policy *x, struct netlink_ext_ack *extack) { - struct net_device *netdev = x->xdo.real_dev; + struct net_device *netdev = x->xdo.dev; struct mlx5e_ipsec_pol_entry *pol_entry; struct mlx5e_priv *priv; int err; diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index d62f76161d83..4f4165ff738d 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -378,7 +378,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, xdo->dev = dev; netdev_tracker_alloc(dev, &xdo->dev_tracker, GFP_ATOMIC); - xdo->real_dev = dev; xdo->type = XFRM_DEV_OFFLOAD_PACKET; switch (dir) { case XFRM_POLICY_IN: @@ -400,7 +399,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, err = dev->xfrmdev_ops->xdo_dev_policy_add(xp, extack); if (err) { xdo->dev = NULL; - xdo->real_dev = NULL; xdo->type = XFRM_DEV_OFFLOAD_UNSPECIFIED; xdo->dir = 0; netdev_put(dev, &xdo->dev_tracker); diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index d896c3fefb07..33d1f5679e8b 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1555,7 +1555,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->type = XFRM_DEV_OFFLOAD_PACKET; xso->dir = xdo->dir; xso->dev = xdo->dev; - xso->real_dev = xdo->real_dev; xso->flags = XFRM_DEV_OFFLOAD_FLAG_ACQ; netdev_hold(xso->dev, &xso->dev_tracker, GFP_ATOMIC); error = xso->dev->xfrmdev_ops->xdo_dev_state_add(x, NULL); @@ -1563,7 +1562,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->dir = 0; netdev_put(xso->dev, &xso->dev_tracker); xso->dev = NULL; - xso->real_dev = NULL; xso->type = XFRM_DEV_OFFLOAD_UNSPECIFIED; x->km.state = XFRM_STATE_DEAD; to_put = x;