From: Ido Schimmel <idosch@mellanox.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>, mlxsw <mlxsw@mellanox.com>,
Ido Schimmel <idosch@mellanox.com>
Subject: [PATCH net-next 09/14] mlxsw: spectrum_acl: Put this_is_rollback to rehash context struct
Date: Thu, 28 Feb 2019 06:59:23 +0000 [thread overview]
Message-ID: <20190228065850.7471-10-idosch@mellanox.com> (raw)
In-Reply-To: <20190228065850.7471-1-idosch@mellanox.com>
From: Jiri Pirko <jiri@mellanox.com>
Put the this_is_rollback flag into rehash context struct in preparations
for interrupt/continue of rehash work.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
.../mellanox/mlxsw/spectrum_acl_tcam.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index 0bc04016c6d0..db80b20e4a13 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -182,6 +182,7 @@ struct mlxsw_sp_acl_tcam_vgroup {
struct mlxsw_sp_acl_tcam_rehash_ctx {
void *hints_priv;
+ bool this_is_rollback;
};
struct mlxsw_sp_acl_tcam_vregion {
@@ -1195,7 +1196,7 @@ static int
mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_acl_tcam_vchunk *vchunk,
struct mlxsw_sp_acl_tcam_region *region,
- bool this_is_rollback)
+ struct mlxsw_sp_acl_tcam_rehash_ctx *ctx)
{
struct mlxsw_sp_acl_tcam_chunk *new_chunk;
struct mlxsw_sp_acl_tcam_ventry *ventry;
@@ -1204,7 +1205,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
new_chunk = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region);
if (IS_ERR(new_chunk)) {
- if (this_is_rollback)
+ if (ctx->this_is_rollback)
vchunk->vregion->failed_rollback = true;
return PTR_ERR(new_chunk);
}
@@ -1215,7 +1216,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,
vchunk->chunk);
if (err) {
- if (this_is_rollback) {
+ if (ctx->this_is_rollback) {
vchunk->vregion->failed_rollback = true;
return err;
}
@@ -1251,7 +1252,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
static int
mlxsw_sp_acl_tcam_vchunk_migrate_all(struct mlxsw_sp *mlxsw_sp,
- struct mlxsw_sp_acl_tcam_vregion *vregion)
+ struct mlxsw_sp_acl_tcam_vregion *vregion,
+ struct mlxsw_sp_acl_tcam_rehash_ctx *ctx)
{
struct mlxsw_sp_acl_tcam_vchunk *vchunk;
int err;
@@ -1259,7 +1261,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_all(struct mlxsw_sp *mlxsw_sp,
list_for_each_entry(vchunk, &vregion->vchunk_list, list) {
err = mlxsw_sp_acl_tcam_vchunk_migrate_one(mlxsw_sp, vchunk,
vregion->region,
- false);
+ ctx);
if (err)
goto rollback;
}
@@ -1270,10 +1272,12 @@ mlxsw_sp_acl_tcam_vchunk_migrate_all(struct mlxsw_sp *mlxsw_sp,
* so the original region pointer is assigned again to vregion->region.
*/
swap(vregion->region, vregion->region2);
+ ctx->this_is_rollback = true;
list_for_each_entry_continue_reverse(vchunk, &vregion->vchunk_list,
list) {
mlxsw_sp_acl_tcam_vchunk_migrate_one(mlxsw_sp, vchunk,
- vregion->region, true);
+ vregion->region,
+ ctx);
}
return err;
}
@@ -1287,7 +1291,7 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
trace_mlxsw_sp_acl_tcam_vregion_migrate(mlxsw_sp, vregion);
mutex_lock(&vregion->lock);
- err = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion);
+ err = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion, ctx);
mutex_unlock(&vregion->lock);
trace_mlxsw_sp_acl_tcam_vregion_migrate_end(mlxsw_sp, vregion);
return err;
@@ -1332,6 +1336,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,
goto err_group_region_attach;
ctx->hints_priv = hints_priv;
+ ctx->this_is_rollback = false;
return 0;
--
2.20.1
next prev parent reply other threads:[~2019-02-28 6:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 6:59 [PATCH net-next 00/14] mlxsw: spectrum_acl: Split rehash work into chunks Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 01/14] mlxsw: spectrum_acl: Push rehash dw struct into rehash sub-struct Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 02/14] mlxsw: spectrum_acl: Don't migrate already migrated entry Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 03/14] mlxsw: spectrum_acl: Introduce new rehash context struct and save hint_priv there Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 05/14] mlxsw: spectrum_acl: Push code start/end from mlxsw_sp_acl_tcam_vregion_migrate() Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 04/14] mlxsw: spectrum_acl: Push rehash start/end code into separate functions Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 06/14] mlxsw: spectrum_acl: assign vregion->region by the newly created region Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 07/14] mlxsw: spectrum_acl: assign vchunk->chunk by the newly created chunk Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 08/14] mlxsw: spectrum_acl: Rename variables in mlxsw_sp_acl_tcam_ventry_migrate() Ido Schimmel
2019-02-28 6:59 ` Ido Schimmel [this message]
2019-02-28 6:59 ` [PATCH net-next 11/14] mlxsw: spectrum_acl: Do rollback as another call to mlxsw_sp_acl_tcam_vchunk_migrate_all() Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 10/14] mlxsw: spectrum_acl: Put vchunk migrate start/end code into separate functions Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 12/14] mlxsw: spectrum_acl: Allow to interrupt/continue rehash work Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 13/14] mlxsw: spectrum_acl: Remember where to continue rehash migration Ido Schimmel
2019-02-28 6:59 ` [PATCH net-next 14/14] mlxsw: spectrum_acl: Make mlxsw_sp_acl_tcam_vregion_rehash() return void Ido Schimmel
2019-03-02 5:44 ` [PATCH net-next 00/14] mlxsw: spectrum_acl: Split rehash work into chunks 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=20190228065850.7471-10-idosch@mellanox.com \
--to=idosch@mellanox.com \
--cc=davem@davemloft.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox