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: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
359fce1d40
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -347,6 +347,11 @@ int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei)
|
|||
return mlxsw_afa_block_append_drop(rulei->act_block);
|
||||
}
|
||||
|
||||
int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei)
|
||||
{
|
||||
return mlxsw_afa_block_append_trap(rulei->act_block);
|
||||
}
|
||||
|
||||
int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp,
|
||||
struct mlxsw_sp_acl_rule_info *rulei,
|
||||
struct net_device *out_dev)
|
||||
|
|
|
@ -67,6 +67,10 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
|
|||
err = mlxsw_sp_acl_rulei_act_drop(rulei);
|
||||
if (err)
|
||||
return err;
|
||||
} else if (is_tcf_gact_trap(a)) {
|
||||
err = mlxsw_sp_acl_rulei_act_trap(rulei);
|
||||
if (err)
|
||||
return err;
|
||||
} else if (is_tcf_mirred_egress_redirect(a)) {
|
||||
int ifindex = tcf_mirred_ifindex(a);
|
||||
struct net_device *out_dev;
|
||||
|
|
|
@ -66,6 +66,7 @@ enum {
|
|||
MLXSW_TRAP_ID_RTR_INGRESS0 = 0x70,
|
||||
MLXSW_TRAP_ID_BGP_IPV4 = 0x88,
|
||||
MLXSW_TRAP_ID_HOST_MISS_IPV4 = 0x90,
|
||||
MLXSW_TRAP_ID_ACL0 = 0x1C0,
|
||||
|
||||
MLXSW_TRAP_ID_MAX = 0x1FF
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@ struct tcf_gact {
|
|||
};
|
||||
#define to_gact(a) ((struct tcf_gact *)a)
|
||||
|
||||
static inline bool is_tcf_gact_shot(const struct tc_action *a)
|
||||
static inline bool __is_tcf_gact_act(const struct tc_action *a, int act)
|
||||
{
|
||||
#ifdef CONFIG_NET_CLS_ACT
|
||||
struct tcf_gact *gact;
|
||||
|
@ -24,10 +24,21 @@ static inline bool is_tcf_gact_shot(const struct tc_action *a)
|
|||
return false;
|
||||
|
||||
gact = to_gact(a);
|
||||
if (gact->tcf_action == TC_ACT_SHOT)
|
||||
if (gact->tcf_action == act)
|
||||
return true;
|
||||
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
static inline bool is_tcf_gact_shot(const struct tc_action *a)
|
||||
{
|
||||
return __is_tcf_gact_act(a, TC_ACT_SHOT);
|
||||
}
|
||||
|
||||
static inline bool is_tcf_gact_trap(const struct tc_action *a)
|
||||
{
|
||||
return __is_tcf_gact_act(a, TC_ACT_TRAP);
|
||||
}
|
||||
|
||||
#endif /* __NET_TC_GACT_H */
|
||||
|
|
|
@ -37,6 +37,13 @@ enum {
|
|||
#define TC_ACT_QUEUED 5
|
||||
#define TC_ACT_REPEAT 6
|
||||
#define TC_ACT_REDIRECT 7
|
||||
#define TC_ACT_TRAP 8 /* For hw path, this means "trap to cpu"
|
||||
* and don't further process the frame
|
||||
* in hardware. For sw path, this is
|
||||
* equivalent of TC_ACT_STOLEN - drop
|
||||
* the skb and act like everything
|
||||
* is alright.
|
||||
*/
|
||||
|
||||
/* There is a special kind of actions called "extended actions",
|
||||
* which need a value parameter. These have a local opcode located in
|
||||
|
|
|
@ -3269,6 +3269,7 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)
|
|||
return NULL;
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*ret = NET_XMIT_SUCCESS;
|
||||
consume_skb(skb);
|
||||
return NULL;
|
||||
|
@ -4038,6 +4039,7 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,
|
|||
return NULL;
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
consume_skb(skb);
|
||||
return NULL;
|
||||
case TC_ACT_REDIRECT:
|
||||
|
|
|
@ -70,6 +70,7 @@ static int cls_bpf_exec_opcode(int code)
|
|||
case TC_ACT_OK:
|
||||
case TC_ACT_SHOT:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
case TC_ACT_REDIRECT:
|
||||
case TC_ACT_UNSPEC:
|
||||
return code;
|
||||
|
|
|
@ -406,6 +406,7 @@ done:
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
__qdisc_drop(skb, to_free);
|
||||
return NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
|
|
|
@ -254,6 +254,7 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -339,6 +339,7 @@ static struct drr_class *drr_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -243,6 +243,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|||
#ifdef CONFIG_NET_CLS_ACT
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
__qdisc_drop(skb, to_free);
|
||||
return NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
|
||||
|
|
|
@ -103,6 +103,7 @@ static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|||
switch (result) {
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return 0;
|
||||
|
|
|
@ -1155,6 +1155,7 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -238,6 +238,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -52,6 +52,7 @@ multiq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|||
switch (err) {
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -48,6 +48,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|||
switch (err) {
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -726,6 +726,7 @@ static struct qfq_class *qfq_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|||
switch (result) {
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return NULL;
|
||||
|
|
|
@ -266,6 +266,7 @@ static bool sfb_classify(struct sk_buff *skb, struct tcf_proto *fl,
|
|||
switch (result) {
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return false;
|
||||
|
|
|
@ -187,6 +187,7 @@ static unsigned int sfq_classify(struct sk_buff *skb, struct Qdisc *sch,
|
|||
switch (result) {
|
||||
case TC_ACT_STOLEN:
|
||||
case TC_ACT_QUEUED:
|
||||
case TC_ACT_TRAP:
|
||||
*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
|
||||
case TC_ACT_SHOT:
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue