Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 359fce1d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-trap-control-action' 



Jiri Pirko says:

====================
net: introduce trap control action to tc and offload it

This patchset introduces a control action dedicated to indicate
to trap the matched packet to CPU. This is specific action for
HW offloads. Also, the patchset offloads the action to mlxsw driver.

Example usage:
$ tc filter add dev enp3s0np19 parent ffff: protocol ip prio 20 flower skip_sw dst_ip 192.168.10.1 action trap

v1->v2:
- patch 1
  - fix the comment according to Andrew's note
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 928a7595 bd5ddba5

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

+38 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/list.h>



#include "item.h"

#include "trap.h"

#include "core_acl_flex_actions.h"



enum mlxsw_afa_set_type {
@@ -662,6 +663,16 @@ EXPORT_SYMBOL(mlxsw_afa_block_append_vlan_modify); 
#define MLXSW_AFA_TRAPDISC_CODE 0x03

#define MLXSW_AFA_TRAPDISC_SIZE 1



enum mlxsw_afa_trapdisc_trap_action {

	MLXSW_AFA_TRAPDISC_TRAP_ACTION_NOP = 0,

	MLXSW_AFA_TRAPDISC_TRAP_ACTION_TRAP = 2,

};



/* afa_trapdisc_trap_action

 * Trap Action.

 */

MLXSW_ITEM32(afa, trapdisc, trap_action, 0x00, 24, 4);



enum mlxsw_afa_trapdisc_forward_action {

	MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD = 3,

};
@@ -671,11 +682,20 @@ enum mlxsw_afa_trapdisc_forward_action { 
 */

MLXSW_ITEM32(afa, trapdisc, forward_action, 0x00, 0, 4);



/* afa_trapdisc_trap_id

 * Trap ID to configure.

 */

MLXSW_ITEM32(afa, trapdisc, trap_id, 0x04, 0, 9);



static inline void

mlxsw_afa_trapdisc_pack(char *payload,

			enum mlxsw_afa_trapdisc_forward_action forward_action)

			enum mlxsw_afa_trapdisc_trap_action trap_action,

			enum mlxsw_afa_trapdisc_forward_action forward_action,

			u16 trap_id)

{

	mlxsw_afa_trapdisc_trap_action_set(payload, trap_action);

	mlxsw_afa_trapdisc_forward_action_set(payload, forward_action);

	mlxsw_afa_trapdisc_trap_id_set(payload, trap_id);

}



int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block)
@@ -686,11 +706,27 @@ int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block) 


	if (!act)

		return -ENOBUFS;

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD);

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_NOP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD, 0);

	return 0;

}

EXPORT_SYMBOL(mlxsw_afa_block_append_drop);



int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block)

{

	char *act = mlxsw_afa_block_append_action(block,

						  MLXSW_AFA_TRAPDISC_CODE,

						  MLXSW_AFA_TRAPDISC_SIZE);



	if (!act)

		return -ENOBUFS;

	mlxsw_afa_trapdisc_pack(act, MLXSW_AFA_TRAPDISC_TRAP_ACTION_TRAP,

				MLXSW_AFA_TRAPDISC_FORWARD_ACTION_DISCARD,

				MLXSW_TRAP_ID_ACL0);

	return 0;

}

EXPORT_SYMBOL(mlxsw_afa_block_append_trap);



/* Forwarding Action

 * -----------------

 * Forwarding Action can be used to implement Policy Based Switching (PBS)

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block); 
void mlxsw_afa_block_continue(struct mlxsw_afa_block *block);

void mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id);

int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block);

int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block);

int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block,

			       u8 local_port, bool in_port);

int mlxsw_afa_block_append_vlan_modify(struct mlxsw_afa_block *block,

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ MLXSW_ITEM32(pci, cqe, byte_count, 0x04, 0, 14); 
/* pci_cqe_trap_id

 * Trap ID that captured the packet.

 */

MLXSW_ITEM32(pci, cqe, trap_id, 0x08, 0, 8);

MLXSW_ITEM32(pci, cqe, trap_id, 0x08, 0, 9);



/* pci_cqe_crc

 * Length include CRC. Indicates the length field includes

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

+3 −1
Original line number Diff line number Diff line
@@ -3261,7 +3261,9 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	MLXSW_SP_RXL_NO_MARK(BGP_IPV4, TRAP_TO_CPU, BGP_IPV4, false),

	/* PKT Sample trap */

	MLXSW_RXL(mlxsw_sp_rx_listener_sample_func, PKT_SAMPLE, MIRROR_TO_CPU,

		  false, SP_IP2ME, DISCARD)

		  false, SP_IP2ME, DISCARD),

	/* ACL trap */

	MLXSW_SP_RXL_NO_MARK(ACL0, TRAP_TO_CPU, IP2ME, false),

};



static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core)

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

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ void mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei); 
void mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,

				 u16 group_id);

int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_acl_rule_info *rulei,

			       struct net_device *out_dev);