Commit 3b43f19d authored by Sai Krishna's avatar Sai Krishna Committed by David S. Miller
Browse files

octeontx2-pf: Add TC flower offload support for TCP flags 



This patch adds TC offload support for matching TCP flags
from TCP header.

Example usage:
tc qdisc add dev eth0 ingress

TC rule to drop the TCP SYN packets:
tc filter add dev eth0 ingress protocol ip flower ip_proto tcp tcp_flags
0x02/0x3f skip_sw action drop

Signed-off-by: default avatarSai Krishna <saikrishnag@marvell.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent caabd859

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+1 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,7 @@ struct flow_msg { 
	u32 mpls_lse[4];

	u8 icmp_type;

	u8 icmp_code;

	__be16 tcp_flags;

};



struct npc_install_flow_req {

drivers/net/ethernet/marvell/octeontx2/af/npc.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ enum key_fields { 
	NPC_MPLS4_TTL,

	NPC_TYPE_ICMP,

	NPC_CODE_ICMP,

	NPC_TCP_FLAGS,

	NPC_HEADER_FIELDS_MAX,

	NPC_CHAN = NPC_HEADER_FIELDS_MAX, /* Valid when Rx */

	NPC_PF_FUNC, /* Valid when Tx */

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c

+4 −0
Original line number Diff line number Diff line
@@ -2870,6 +2870,10 @@ static void rvu_dbg_npc_mcam_show_flows(struct seq_file *s, 
			seq_printf(s, "%d ", ntohs(rule->packet.dport));

			seq_printf(s, "mask 0x%x\n", ntohs(rule->mask.dport));

			break;

		case NPC_TCP_FLAGS:

			seq_printf(s, "%d ", rule->packet.tcp_flags);

			seq_printf(s, "mask 0x%x\n", rule->mask.tcp_flags);

			break;

		case NPC_IPSEC_SPI:

			seq_printf(s, "0x%x ", ntohl(rule->packet.spi));

			seq_printf(s, "mask 0x%x\n", ntohl(rule->mask.spi));

drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c

+6 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static const char * const npc_flow_names[] = { 
	[NPC_MPLS4_TTL]     = "lse depth 4",

	[NPC_TYPE_ICMP] = "icmp type",

	[NPC_CODE_ICMP] = "icmp code",

	[NPC_TCP_FLAGS] = "tcp flags",

	[NPC_UNKNOWN]	= "unknown",

};
@@ -530,6 +531,7 @@ do { \ 
	NPC_SCAN_HDR(NPC_DPORT_SCTP, NPC_LID_LD, NPC_LT_LD_SCTP, 2, 2);

	NPC_SCAN_HDR(NPC_TYPE_ICMP, NPC_LID_LD, NPC_LT_LD_ICMP, 0, 1);

	NPC_SCAN_HDR(NPC_CODE_ICMP, NPC_LID_LD, NPC_LT_LD_ICMP, 1, 1);

	NPC_SCAN_HDR(NPC_TCP_FLAGS, NPC_LID_LD, NPC_LT_LD_TCP, 12, 2);

	NPC_SCAN_HDR(NPC_ETYPE_ETHER, NPC_LID_LA, NPC_LT_LA_ETHER, 12, 2);

	NPC_SCAN_HDR(NPC_ETYPE_TAG1, NPC_LID_LB, NPC_LT_LB_CTAG, 4, 2);

	NPC_SCAN_HDR(NPC_ETYPE_TAG2, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 8, 2);
@@ -574,7 +576,8 @@ static void npc_set_features(struct rvu *rvu, int blkaddr, u8 intf) 
		       BIT_ULL(NPC_DPORT_TCP) | BIT_ULL(NPC_DPORT_UDP) |

		       BIT_ULL(NPC_SPORT_SCTP) | BIT_ULL(NPC_DPORT_SCTP) |

		       BIT_ULL(NPC_SPORT_SCTP) | BIT_ULL(NPC_DPORT_SCTP) |

		       BIT_ULL(NPC_TYPE_ICMP) | BIT_ULL(NPC_CODE_ICMP);

		       BIT_ULL(NPC_TYPE_ICMP) | BIT_ULL(NPC_CODE_ICMP) |

		       BIT_ULL(NPC_TCP_FLAGS);



	/* for tcp/udp/sctp corresponding layer type should be in the key */

	if (*features & proto_flags) {
@@ -982,7 +985,8 @@ do { \ 
		       mask->icmp_type, 0);

	NPC_WRITE_FLOW(NPC_CODE_ICMP, icmp_code, pkt->icmp_code, 0,

		       mask->icmp_code, 0);



	NPC_WRITE_FLOW(NPC_TCP_FLAGS, tcp_flags, ntohs(pkt->tcp_flags), 0,

		       ntohs(mask->tcp_flags), 0);

	NPC_WRITE_FLOW(NPC_IPSEC_SPI, spi, ntohl(pkt->spi), 0,

		       ntohl(mask->spi), 0);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

+11 −0
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, 
	      BIT(FLOW_DISSECTOR_KEY_IPSEC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_MPLS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_ICMP) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_TCP) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IP))))  {

		netdev_info(nic->netdev, "unsupported flow used key 0x%llx",

			    dissector->used_keys);
@@ -857,6 +858,16 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, 
		}

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_TCP)) {

		struct flow_match_tcp match;



		flow_rule_match_tcp(rule, &match);



		flow_spec->tcp_flags = match.key->flags;

		flow_mask->tcp_flags = match.mask->flags;

		req->features |= BIT_ULL(NPC_TCP_FLAGS);

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_MPLS)) {

		struct flow_match_mpls match;

		u8 bit;