Commit 9d33ffaa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeontx2-Add-support-for-VLAN-based-flow-distribution' 



George Cherian says:

====================
octeontx2: Add support for VLAN based flow distribution

This series add support for VLAN based flow distribution for octeontx2
netdev driver. This adds support for configuring the same via ethtool.

Following tests have been done.
	- Multi VLAN flow with same SD
	- Multi VLAN flow with same SDFN
	- Single VLAN flow with multi SD
	- Single VLAN flow with multi SDFN
All tests done for udp/tcp both v4 and v6
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de2b541b a55ff8ef

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

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ struct nix_rss_flowkey_cfg { 
#define NIX_FLOW_KEY_TYPE_INNR_UDP      BIT(15)

#define NIX_FLOW_KEY_TYPE_INNR_SCTP     BIT(16)

#define NIX_FLOW_KEY_TYPE_INNR_ETH_DMAC BIT(17)

#define NIX_FLOW_KEY_TYPE_VLAN		BIT(20)

	u32	flowkey_cfg; /* Flowkey types selected */

	u8	group;       /* RSS context or group */

};

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

+8 −0
Original line number Diff line number Diff line
@@ -2509,6 +2509,14 @@ static int set_flowkey_fields(struct nix_rx_flowkey_alg *alg, u32 flow_cfg) 
			field->ltype_match = NPC_LT_LE_GTPU;

			field->ltype_mask = 0xF;

			break;

		case NIX_FLOW_KEY_TYPE_VLAN:

			field->lid = NPC_LID_LB;

			field->hdr_offset = 2; /* Skip TPID (2-bytes) */

			field->bytesm1 = 1; /* 2 Bytes (Actually 12 bits) */

			field->ltype_match = NPC_LT_LB_CTAG;

			field->ltype_mask = 0xF;

			field->fn_mask = 1; /* Mask out the first nibble */

			break;

		}

		field->ena = 1;

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

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ int otx2_rss_init(struct otx2_nic *pfvf) 
	rss->flowkey_cfg = rss->enable ? rss->flowkey_cfg :

			   NIX_FLOW_KEY_TYPE_IPV4 | NIX_FLOW_KEY_TYPE_IPV6 |

			   NIX_FLOW_KEY_TYPE_TCP | NIX_FLOW_KEY_TYPE_UDP |

			   NIX_FLOW_KEY_TYPE_SCTP;

			   NIX_FLOW_KEY_TYPE_SCTP | NIX_FLOW_KEY_TYPE_VLAN;



	ret = otx2_set_flowkey_cfg(pfvf);

	if (ret)

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

+7 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ static int otx2_get_rss_hash_opts(struct otx2_nic *pfvf, 


	/* Mimimum is IPv4 and IPv6, SIP/DIP */

	nfc->data = RXH_IP_SRC | RXH_IP_DST;

	if (rss->flowkey_cfg & NIX_FLOW_KEY_TYPE_VLAN)

		nfc->data |= RXH_VLAN;



	switch (nfc->flow_type) {

	case TCP_V4_FLOW:
@@ -477,6 +479,11 @@ static int otx2_set_rss_hash_opts(struct otx2_nic *pfvf, 
	if (!(nfc->data & RXH_IP_SRC) || !(nfc->data & RXH_IP_DST))

		return -EINVAL;



	if (nfc->data & RXH_VLAN)

		rss_cfg |=  NIX_FLOW_KEY_TYPE_VLAN;

	else

		rss_cfg &= ~NIX_FLOW_KEY_TYPE_VLAN;



	switch (nfc->flow_type) {

	case TCP_V4_FLOW:

	case TCP_V6_FLOW:

CRA Git | Maintained and supported by SUSTech CRA and CCSE