Commit 2b3082c6 authored by Ratheesh Kannoth's avatar Ratheesh Kannoth Committed by David S. Miller
Browse files

net: flow_dissector: Use 64bits for used_keys 

As 32bits of dissector->used_keys are exhausted,
increase the size to 64bits.

This is base change for ESP/AH flow dissector patch.
Please find patch and discussions at
https://lore.kernel.org/netdev/ZMDNjD46BvZ5zp5I@corigine.com/T/#t



Signed-off-by: default avatarRatheesh Kannoth <rkannoth@marvell.com>
Reviewed-by: Petr Machata <petrm@nvidia.com> # for mlxsw
Tested-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64a37272

drivers/net/dsa/ocelot/felix_vsc9959.c

+4 −4
Original line number Diff line number Diff line
@@ -1746,10 +1746,10 @@ static int vsc9959_stream_identify(struct flow_cls_offload *f, 
	struct flow_dissector *dissector = rule->match.dissector;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS)))

	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS)))

		return -EOPNOTSUPP;



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {

drivers/net/dsa/sja1105/sja1105_flower.c

+4 −4
Original line number Diff line number Diff line
@@ -205,10 +205,10 @@ static int sja1105_flower_parse_key(struct sja1105_private *priv, 
	u16 pcp = U16_MAX;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {

	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Unsupported keys used");

		return -EOPNOTSUPP;

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+3 −3
Original line number Diff line number Diff line
@@ -373,9 +373,9 @@ static int bnxt_tc_parse_flow(struct bnxt *bp, 
	struct flow_dissector *dissector = rule->match.dissector;



	/* KEY_CONTROL and KEY_BASIC are needed for forming a meaningful key */

	if ((dissector->used_keys & BIT(FLOW_DISSECTOR_KEY_CONTROL)) == 0 ||

	    (dissector->used_keys & BIT(FLOW_DISSECTOR_KEY_BASIC)) == 0) {

		netdev_info(bp->dev, "cannot form TC key: used_keys = 0x%x\n",

	if ((dissector->used_keys & BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL)) == 0 ||

	    (dissector->used_keys & BIT_ULL(FLOW_DISSECTOR_KEY_BASIC)) == 0) {

		netdev_info(bp->dev, "cannot form TC key: used_keys = 0x%llx\n",

			    dissector->used_keys);

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+9 −9
Original line number Diff line number Diff line
@@ -313,15 +313,15 @@ static int cxgb4_validate_flow_match(struct net_device *dev, 
	u16 ethtype_key = 0;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT(FLOW_DISSECTOR_KEY_ENC_KEYID) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_IP))) {

		netdev_warn(dev, "Unsupported key used: 0x%x\n",

	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IP))) {

		netdev_warn(dev, "Unsupported key used: 0x%llx\n",

			    dissector->used_keys);

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c

+11 −11
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ static int dpaa2_switch_flower_parse_key(struct flow_cls_offload *cls, 
	struct dpsw_acl_fields *acl_h, *acl_m;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT(FLOW_DISSECTOR_KEY_IP) |

	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS))) {

	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IP) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS))) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Unsupported keys used");

		return -EOPNOTSUPP;
@@ -539,9 +539,9 @@ static int dpaa2_switch_flower_parse_mirror_key(struct flow_cls_offload *cls, 
	int ret = -EOPNOTSUPP;



	if (dissector->used_keys &

	    ~(BIT(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT(FLOW_DISSECTOR_KEY_VLAN))) {

	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |

	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN))) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Mirroring is supported only per VLAN");

		return -EOPNOTSUPP;