Commit 64eccd00 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Split TCAM handling 3 ways 



To allow easy and clean Spectrum-2 implementation for things that differ
from Spectrum, split the existing ACL TCAM code 3 ways:
1) common code that calls Spectrum/Spectrum-2 specific ops
2) Spectrum ops implementations
3) common C-TCAM code that is going to be shared between Spectrum and
   Spectrum-2 implementations

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fae4392

drivers/net/ethernet/mellanox/mlxsw/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ obj-$(CONFIG_MLXSW_SPECTRUM) += mlxsw_spectrum.o 
mlxsw_spectrum-objs		:= spectrum.o spectrum_buffers.o \

				   spectrum_switchdev.o spectrum_router.o \

				   spectrum1_kvdl.o spectrum_kvdl.o \

				   spectrum_acl_tcam.o spectrum_acl.o \

				   spectrum_acl_tcam.o spectrum_acl_ctcam.o \

				   spectrum1_acl_tcam.o \

				   spectrum_acl.o \

				   spectrum_flower.o spectrum_cnt.o \

				   spectrum_fid.o spectrum_ipip.o \

				   spectrum_acl_flex_actions.o \

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+1 −0
Original line number Diff line number Diff line
@@ -3624,6 +3624,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->kvdl_ops = &mlxsw_sp1_kvdl_ops;

	mlxsw_sp->afa_ops = &mlxsw_sp1_act_afa_ops;

	mlxsw_sp->mr_tcam_ops = &mlxsw_sp1_mr_tcam_ops;

	mlxsw_sp->acl_tcam_ops = &mlxsw_sp1_acl_tcam_ops;



	mlxsw_sp->core = mlxsw_core;

	mlxsw_sp->bus_info = mlxsw_bus_info;

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+30 −2
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct mlxsw_sp_fid_core; 
struct mlxsw_sp_kvdl;

struct mlxsw_sp_kvdl_ops;

struct mlxsw_sp_mr_tcam_ops;

struct mlxsw_sp_acl_tcam_ops;



struct mlxsw_sp {

	struct mlxsw_sp_port **ports;
@@ -173,6 +174,7 @@ struct mlxsw_sp { 
	const struct mlxsw_sp_kvdl_ops *kvdl_ops;

	const struct mlxsw_afa_ops *afa_ops;

	const struct mlxsw_sp_mr_tcam_ops *mr_tcam_ops;

	const struct mlxsw_sp_acl_tcam_ops *acl_tcam_ops;

};



static inline struct mlxsw_sp_upper *
@@ -517,7 +519,7 @@ struct mlxsw_sp_acl_profile_ops { 
			       struct mlxsw_sp_port *mlxsw_sp_port,

			       bool ingress);

	u16 (*ruleset_group_id)(void *ruleset_priv);

	size_t rule_priv_size;

	size_t (*rule_priv_size)(struct mlxsw_sp *mlxsw_sp);

	int (*rule_add)(struct mlxsw_sp *mlxsw_sp,

			void *ruleset_priv, void *rule_priv,

			struct mlxsw_sp_acl_rule_info *rulei);
@@ -631,7 +633,33 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp); 
void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp);



/* spectrum_acl_tcam.c */

extern const struct mlxsw_sp_acl_ops mlxsw_sp_acl_tcam_ops;

struct mlxsw_sp_acl_tcam_region;



struct mlxsw_sp_acl_tcam_ops {

	enum mlxsw_reg_ptar_key_type key_type;

	size_t region_priv_size;

	int (*region_init)(struct mlxsw_sp *mlxsw_sp, void *region_priv,

			   struct mlxsw_sp_acl_tcam_region *region);

	void (*region_fini)(struct mlxsw_sp *mlxsw_sp, void *region_priv);

	size_t chunk_priv_size;

	void (*chunk_init)(void *region_priv, void *chunk_priv,

			   unsigned int priority);

	void (*chunk_fini)(void *chunk_priv);

	size_t entry_priv_size;

	int (*entry_add)(struct mlxsw_sp *mlxsw_sp,

			 void *region_priv, void *chunk_priv,

			 void *entry_priv,

			 struct mlxsw_sp_acl_rule_info *rulei);

	void (*entry_del)(struct mlxsw_sp *mlxsw_sp,

			  void *region_priv, void *chunk_priv,

			  void *entry_priv);

	int (*entry_activity_get)(struct mlxsw_sp *mlxsw_sp,

				  void *region_priv, void *entry_priv,

				  bool *activity);

};



/* spectrum1_acl_tcam.c */

extern const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops;



/* spectrum_acl_flex_actions.c */

extern const struct mlxsw_afa_ops mlxsw_sp1_act_afa_ops;

drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c

0 → 100644
+231 −0
Original line number Diff line number Diff line 
/*

 * drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c

 * Copyright (c) 2017-2018 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017-2018 Jiri Pirko <jiri@mellanox.com>

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. Neither the names of the copyright holders nor the names of its

 *    contributors may be used to endorse or promote products derived from

 *    this software without specific prior written permission.

 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2 as published by the Free

 * Software Foundation.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <linux/kernel.h>

#include <linux/slab.h>



#include "reg.h"

#include "core.h"

#include "spectrum.h"

#include "spectrum_acl_tcam.h"



struct mlxsw_sp1_acl_tcam_region {

	struct mlxsw_sp_acl_ctcam_region cregion;

	struct mlxsw_sp_acl_tcam_region *region;

	struct {

		struct mlxsw_sp_acl_ctcam_chunk cchunk;

		struct mlxsw_sp_acl_ctcam_entry centry;

		struct mlxsw_sp_acl_rule_info *rulei;

	} catchall;

};



struct mlxsw_sp1_acl_tcam_chunk {

	struct mlxsw_sp_acl_ctcam_chunk cchunk;

};



struct mlxsw_sp1_acl_tcam_entry {

	struct mlxsw_sp_acl_ctcam_entry centry;

};



static int

mlxsw_sp1_acl_ctcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp1_acl_tcam_region *region)

{

	struct mlxsw_sp_acl_rule_info *rulei;

	int err;



	mlxsw_sp_acl_ctcam_chunk_init(&region->cregion,

				      &region->catchall.cchunk,

				      MLXSW_SP_ACL_TCAM_CATCHALL_PRIO);

	rulei = mlxsw_sp_acl_rulei_create(mlxsw_sp->acl);

	if (IS_ERR(rulei)) {

		err = PTR_ERR(rulei);

		goto err_rulei_create;

	}

	err = mlxsw_sp_acl_rulei_act_continue(rulei);

	if (WARN_ON(err))

		goto err_rulei_act_continue;

	err = mlxsw_sp_acl_rulei_commit(rulei);

	if (err)

		goto err_rulei_commit;

	err = mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &region->cregion,

					   &region->catchall.cchunk,

					   &region->catchall.centry, rulei);

	if (err)

		goto err_entry_add;

	region->catchall.rulei = rulei;

	return 0;



err_entry_add:

err_rulei_commit:

err_rulei_act_continue:

	mlxsw_sp_acl_rulei_destroy(rulei);

err_rulei_create:

	mlxsw_sp_acl_ctcam_chunk_fini(&region->catchall.cchunk);

	return err;

}



static void

mlxsw_sp1_acl_ctcam_region_catchall_del(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp1_acl_tcam_region *region)

{

	struct mlxsw_sp_acl_rule_info *rulei = region->catchall.rulei;



	mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &region->cregion,

				     &region->catchall.cchunk,

				     &region->catchall.centry);

	mlxsw_sp_acl_rulei_destroy(rulei);

	mlxsw_sp_acl_ctcam_chunk_fini(&region->catchall.cchunk);

}



static int

mlxsw_sp1_acl_tcam_region_init(struct mlxsw_sp *mlxsw_sp, void *region_priv,

			       struct mlxsw_sp_acl_tcam_region *_region)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	int err;



	err = mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &region->cregion,

					     _region);

	if (err)

		return err;

	err = mlxsw_sp1_acl_ctcam_region_catchall_add(mlxsw_sp, region);

	if (err)

		goto err_catchall_add;

	region->region = _region;

	return 0;



err_catchall_add:

	mlxsw_sp_acl_ctcam_region_fini(&region->cregion);

	return err;

}



static void

mlxsw_sp1_acl_tcam_region_fini(struct mlxsw_sp *mlxsw_sp, void *region_priv)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;



	mlxsw_sp1_acl_ctcam_region_catchall_del(mlxsw_sp, region);

	mlxsw_sp_acl_ctcam_region_fini(&region->cregion);

}



static void mlxsw_sp1_acl_tcam_chunk_init(void *region_priv, void *chunk_priv,

					  unsigned int priority)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	struct mlxsw_sp1_acl_tcam_chunk *chunk = chunk_priv;



	mlxsw_sp_acl_ctcam_chunk_init(&region->cregion, &chunk->cchunk,

				      priority);

}



static void mlxsw_sp1_acl_tcam_chunk_fini(void *chunk_priv)

{

	struct mlxsw_sp1_acl_tcam_chunk *chunk = chunk_priv;



	mlxsw_sp_acl_ctcam_chunk_fini(&chunk->cchunk);

}



static int mlxsw_sp1_acl_tcam_entry_add(struct mlxsw_sp *mlxsw_sp,

					void *region_priv, void *chunk_priv,

					void *entry_priv,

					struct mlxsw_sp_acl_rule_info *rulei)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	struct mlxsw_sp1_acl_tcam_chunk *chunk = chunk_priv;

	struct mlxsw_sp1_acl_tcam_entry *entry = entry_priv;



	return mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &region->cregion,

					    &chunk->cchunk, &entry->centry,

					    rulei);

}



static void mlxsw_sp1_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp,

					 void *region_priv, void *chunk_priv,

					 void *entry_priv)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	struct mlxsw_sp1_acl_tcam_chunk *chunk = chunk_priv;

	struct mlxsw_sp1_acl_tcam_entry *entry = entry_priv;



	mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &region->cregion,

				     &chunk->cchunk, &entry->centry);

}



static int

mlxsw_sp1_acl_tcam_region_entry_activity_get(struct mlxsw_sp *mlxsw_sp,

					     struct mlxsw_sp_acl_tcam_region *_region,

					     unsigned int offset,

					     bool *activity)

{

	char ptce2_pl[MLXSW_REG_PTCE2_LEN];

	int err;



	mlxsw_reg_ptce2_pack(ptce2_pl, true, MLXSW_REG_PTCE2_OP_QUERY_CLEAR_ON_READ,

			     _region->tcam_region_info, offset);

	err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

	if (err)

		return err;

	*activity = mlxsw_reg_ptce2_a_get(ptce2_pl);

	return 0;

}



static int

mlxsw_sp1_acl_tcam_entry_activity_get(struct mlxsw_sp *mlxsw_sp,

				      void *region_priv, void *entry_priv,

				      bool *activity)

{

	struct mlxsw_sp1_acl_tcam_region *region = region_priv;

	struct mlxsw_sp1_acl_tcam_entry *entry = entry_priv;

	unsigned int offset;



	offset = mlxsw_sp_acl_ctcam_entry_offset(&entry->centry);

	return mlxsw_sp1_acl_tcam_region_entry_activity_get(mlxsw_sp,

							    region->region,

							    offset, activity);

}



const struct mlxsw_sp_acl_tcam_ops mlxsw_sp1_acl_tcam_ops = {

	.key_type		= MLXSW_REG_PTAR_KEY_TYPE_FLEX,

	.region_priv_size	= sizeof(struct mlxsw_sp1_acl_tcam_region),

	.region_init		= mlxsw_sp1_acl_tcam_region_init,

	.region_fini		= mlxsw_sp1_acl_tcam_region_fini,

	.chunk_priv_size	= sizeof(struct mlxsw_sp1_acl_tcam_chunk),

	.chunk_init		= mlxsw_sp1_acl_tcam_chunk_init,

	.chunk_fini		= mlxsw_sp1_acl_tcam_chunk_fini,

	.entry_priv_size	= sizeof(struct mlxsw_sp1_acl_tcam_entry),

	.entry_add		= mlxsw_sp1_acl_tcam_entry_add,

	.entry_del		= mlxsw_sp1_acl_tcam_entry_del,

	.entry_activity_get	= mlxsw_sp1_acl_tcam_entry_activity_get,

};

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "spectrum.h"

#include "core_acl_flex_keys.h"

#include "core_acl_flex_actions.h"

#include "spectrum_acl_tcam.h"

#include "spectrum_acl_flex_keys.h"



struct mlxsw_sp_acl {
@@ -634,7 +635,8 @@ mlxsw_sp_acl_rule_create(struct mlxsw_sp *mlxsw_sp, 
	int err;



	mlxsw_sp_acl_ruleset_ref_inc(ruleset);

	rule = kzalloc(sizeof(*rule) + ops->rule_priv_size, GFP_KERNEL);

	rule = kzalloc(sizeof(*rule) + ops->rule_priv_size(mlxsw_sp),

		       GFP_KERNEL);

	if (!rule) {

		err = -ENOMEM;

		goto err_alloc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE