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 15/15] mlxsw: spectrum_nve: Make tunnel initialization symmetric
Date: Thu, 20 Feb 2020 09:08:00 +0200	[thread overview]
Message-ID: <20200220070800.364235-16-idosch@idosch.org> (raw)
In-Reply-To: <20200220070800.364235-1-idosch@idosch.org>

From: Ido Schimmel <idosch@mellanox.com>

The device supports a single VTEP whose configuration is shared between
all VXLAN tunnels.

While the shared configuration is cleared upon the destruction of the
last tunnel - in mlxsw_sp_nve_tunnel_fini() - it is set in
mlxsw_sp_nve_fid_enable(), after calling mlxsw_sp_nve_tunnel_init().

Make tunnel initialization and destruction symmetric and set the
configuration in mlxsw_sp_nve_tunnel_init().

This will later allow us to protect the shared configuration with a
lock.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
index 16a130c2f21c..eced553fd4ef 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
@@ -744,6 +744,8 @@ static int mlxsw_sp_nve_tunnel_init(struct mlxsw_sp *mlxsw_sp,
 	if (nve->num_nve_tunnels++ != 0)
 		return 0;
 
+	nve->config = *config;
+
 	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ADJ, 1,
 				  &nve->tunnel_index);
 	if (err)
@@ -760,6 +762,7 @@ static int mlxsw_sp_nve_tunnel_init(struct mlxsw_sp *mlxsw_sp,
 	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ADJ, 1,
 			   nve->tunnel_index);
 err_kvdl_alloc:
+	memset(&nve->config, 0, sizeof(nve->config));
 	nve->num_nve_tunnels--;
 	return err;
 }
@@ -840,8 +843,6 @@ int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid,
 		goto err_fid_vni_set;
 	}
 
-	nve->config = config;
-
 	err = ops->fdb_replay(params->dev, params->vni, extack);
 	if (err)
 		goto err_fdb_replay;
-- 
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 ` [PATCH net-next 10/15] mlxsw: spectrum_router: Do not assume RTNL is taken when resolving underlay device Ido Schimmel
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 ` Ido Schimmel [this message]
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-16-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.