All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ido Schimmel <idosch@idosch.org>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jiri@mellanox.com, mlxsw@mellanox.com,
	Ido Schimmel <idosch@mellanox.com>
Subject: [PATCH net-next 10/15] mlxsw: spectrum_router: Do not assume RTNL is taken when resolving underlay device
Date: Thu, 20 Feb 2020 09:07:55 +0200	[thread overview]
Message-ID: <20200220070800.364235-11-idosch@idosch.org> (raw)
In-Reply-To: <20200220070800.364235-1-idosch@idosch.org>

From: Ido Schimmel <idosch@mellanox.com>

The function that resolves the underlay device of the IPIP tunnel
assumes that RTNL is taken, but this will not be correct when RTNL is
removed from the route insertion path.

Convert the function to use dev_get_by_index_rcu() instead of
__dev_get_by_index() and make sure it is always called from an RCU
read-side critical section.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
 .../ethernet/mellanox/mlxsw/spectrum_router.c | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 21e8539727be..000aa68e7e31 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -988,17 +988,23 @@ __mlxsw_sp_ipip_netdev_ul_dev_get(const struct net_device *ol_dev)
 	struct ip_tunnel *tun = netdev_priv(ol_dev);
 	struct net *net = dev_net(ol_dev);
 
-	return __dev_get_by_index(net, tun->parms.link);
+	return dev_get_by_index_rcu(net, tun->parms.link);
 }
 
 u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev)
 {
-	struct net_device *d = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
+	struct net_device *d;
+	u32 tb_id;
 
+	rcu_read_lock();
+	d = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
 	if (d)
-		return l3mdev_fib_table(d) ? : RT_TABLE_MAIN;
+		tb_id = l3mdev_fib_table(d) ? : RT_TABLE_MAIN;
 	else
-		return RT_TABLE_MAIN;
+		tb_id = RT_TABLE_MAIN;
+	rcu_read_unlock();
+
+	return tb_id;
 }
 
 static struct mlxsw_sp_rif *
@@ -1355,8 +1361,12 @@ mlxsw_sp_ipip_entry_find_by_ul_dev(const struct mlxsw_sp *mlxsw_sp,
 					ipip_list_node);
 	list_for_each_entry_continue(ipip_entry, &mlxsw_sp->router->ipip_list,
 				     ipip_list_node) {
-		struct net_device *ipip_ul_dev =
-			__mlxsw_sp_ipip_netdev_ul_dev_get(ipip_entry->ol_dev);
+		struct net_device *ol_dev = ipip_entry->ol_dev;
+		struct net_device *ipip_ul_dev;
+
+		rcu_read_lock();
+		ipip_ul_dev = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
+		rcu_read_unlock();
 
 		if (ipip_ul_dev == ul_dev)
 			return ipip_entry;
@@ -1722,9 +1732,12 @@ static void mlxsw_sp_ipip_demote_tunnel_by_ul_netdev(struct mlxsw_sp *mlxsw_sp,
 
 	list_for_each_entry_safe(ipip_entry, tmp, &mlxsw_sp->router->ipip_list,
 				 ipip_list_node) {
-		struct net_device *ipip_ul_dev =
-			__mlxsw_sp_ipip_netdev_ul_dev_get(ipip_entry->ol_dev);
+		struct net_device *ol_dev = ipip_entry->ol_dev;
+		struct net_device *ipip_ul_dev;
 
+		rcu_read_lock();
+		ipip_ul_dev = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
+		rcu_read_unlock();
 		if (ipip_ul_dev == ul_dev)
 			mlxsw_sp_ipip_entry_demote_tunnel(mlxsw_sp, ipip_entry);
 	}
@@ -3711,9 +3724,15 @@ static void mlxsw_sp_nexthop_neigh_fini(struct mlxsw_sp *mlxsw_sp,
 
 static bool mlxsw_sp_ipip_netdev_ul_up(struct net_device *ol_dev)
 {
-	struct net_device *ul_dev = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
+	struct net_device *ul_dev;
+	bool is_up;
+
+	rcu_read_lock();
+	ul_dev = __mlxsw_sp_ipip_netdev_ul_dev_get(ol_dev);
+	is_up = ul_dev ? (ul_dev->flags & IFF_UP) : true;
+	rcu_read_unlock();
 
-	return ul_dev ? (ul_dev->flags & IFF_UP) : true;
+	return is_up;
 }
 
 static void mlxsw_sp_nexthop_ipip_init(struct mlxsw_sp *mlxsw_sp,
-- 
2.24.1


  parent reply	other threads:[~2020-02-20  7:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-20  7:07 [PATCH net-next 00/15] mlxsw: Preparation for RTNL removal Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 01/15] mlxsw: spectrum_kvdl: Protect allocations with a lock Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 02/15] mlxsw: spectrum: Protect counter pool " Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 03/15] mlxsw: spectrum_span: Do no expose mirroring agents to entire driver Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 04/15] mlxsw: spectrum_span: Use struct_size() to simplify allocation Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 05/15] mlxsw: spectrum_span: Prepare work item to update mirroring agents Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 06/15] mlxsw: spectrum: Convert callers to use new mirroring API Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 07/15] mlxsw: spectrum_span: Only update mirroring agents if present Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 08/15] mlxsw: spectrum_router: Do not assume RTNL is taken during nexthop init Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 09/15] mlxsw: spectrum_router: Do not assume RTNL is taken during RIF teardown Ido Schimmel
2020-02-20  7:07 ` Ido Schimmel [this message]
2020-02-20  7:07 ` [PATCH net-next 11/15] mlxsw: spectrum_router: Prepare function for router lock introduction Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 12/15] " Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 13/15] mlxsw: spectrum: Prevent RIF access outside of routing code Ido Schimmel
2020-02-20  7:07 ` [PATCH net-next 14/15] mlxsw: spectrum: Export function to check if RIF exists Ido Schimmel
2020-02-20  7:08 ` [PATCH net-next 15/15] mlxsw: spectrum_nve: Make tunnel initialization symmetric Ido Schimmel
2020-02-20 18:04 ` [PATCH net-next 00/15] mlxsw: Preparation for RTNL removal David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200220070800.364235-11-idosch@idosch.org \
    --to=idosch@idosch.org \
    --cc=davem@davemloft.net \
    --cc=idosch@mellanox.com \
    --cc=jiri@mellanox.com \
    --cc=mlxsw@mellanox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.