Commit 56beb35d authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: populate enc_ip_tos matches in MAE outer rules 



Currently tc.c will block them before they get here, but following
 patch will change that.
Use the extack message from efx_mae_check_encap_match_caps() instead
 of writing a new one, since there's now more being fed in than just
 an IP version.

Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28fa3ac4

drivers/net/ethernet/sfc/mae.c

+15 −1
Original line number Diff line number Diff line
@@ -482,12 +482,14 @@ int efx_mae_match_check_caps(struct efx_nic *efx, 
	rc;								       \

})

/* Checks that the fields needed for encap-rule matches are supported by the

 * MAE.  All the fields are exact-match.

 * MAE.  All the fields are exact-match, except possibly ENC_IP_TOS.

 */

int efx_mae_check_encap_match_caps(struct efx_nic *efx, bool ipv6,

				   u8 ip_tos_mask,

				   struct netlink_ext_ack *extack)

{

	u8 *supported_fields = efx->tc->caps->outer_rule_fields;

	enum mask_type typ;

	int rc;



	if (CHECK(ENC_ETHER_TYPE))
@@ -504,6 +506,14 @@ int efx_mae_check_encap_match_caps(struct efx_nic *efx, bool ipv6, 
	if (CHECK(ENC_L4_DPORT) ||

	    CHECK(ENC_IP_PROTO))

		return rc;

	typ = classify_mask(&ip_tos_mask, sizeof(ip_tos_mask));

	rc = efx_mae_match_check_cap_typ(supported_fields[MAE_FIELD_ENC_IP_TOS],

					 typ);

	if (rc) {

		NL_SET_ERR_MSG_FMT_MOD(extack, "No support for %s mask in field %s",

				       mask_type_name(typ), "enc_ip_tos");

		return rc;

	}

	return 0;

}

#undef CHECK
@@ -1003,6 +1013,10 @@ int efx_mae_register_encap_match(struct efx_nic *efx, 
				~(__be16)0);

	MCDI_STRUCT_SET_BYTE(match_crit, MAE_ENC_FIELD_PAIRS_ENC_IP_PROTO, IPPROTO_UDP);

	MCDI_STRUCT_SET_BYTE(match_crit, MAE_ENC_FIELD_PAIRS_ENC_IP_PROTO_MASK, ~0);

	MCDI_STRUCT_SET_BYTE(match_crit, MAE_ENC_FIELD_PAIRS_ENC_IP_TOS,

			     encap->ip_tos);

	MCDI_STRUCT_SET_BYTE(match_crit, MAE_ENC_FIELD_PAIRS_ENC_IP_TOS_MASK,

			     encap->ip_tos_mask);

	rc = efx_mcdi_rpc(efx, MC_CMD_MAE_OUTER_RULE_INSERT, inbuf,

			  sizeof(inbuf), outbuf, sizeof(outbuf), &outlen);

	if (rc)

drivers/net/ethernet/sfc/mae.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ int efx_mae_match_check_caps(struct efx_nic *efx, 
			     const struct efx_tc_match_fields *mask,

			     struct netlink_ext_ack *extack);

int efx_mae_check_encap_match_caps(struct efx_nic *efx, bool ipv6,

				   u8 ip_tos_mask,

				   struct netlink_ext_ack *extack);

int efx_mae_check_encap_type_supported(struct efx_nic *efx,

				       enum efx_encap_type typ);

drivers/net/ethernet/sfc/tc.c

+3 −6
Original line number Diff line number Diff line
@@ -410,12 +410,9 @@ static int efx_tc_flower_record_encap_match(struct efx_nic *efx, 
		return -EOPNOTSUPP;

	}



	rc = efx_mae_check_encap_match_caps(efx, ipv6, extack);

	if (rc) {

		NL_SET_ERR_MSG_FMT_MOD(extack, "MAE hw reports no support for IPv%d encap matches",

				       ipv6 ? 6 : 4);

		return -EOPNOTSUPP;

	}

	rc = efx_mae_check_encap_match_caps(efx, ipv6, match->mask.enc_ip_tos, extack);

	if (rc)

		return rc;



	encap = kzalloc(sizeof(*encap), GFP_USER);

	if (!encap)

drivers/net/ethernet/sfc/tc.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct efx_tc_encap_match { 
	__be32 src_ip, dst_ip;

	struct in6_addr src_ip6, dst_ip6;

	__be16 udp_dport;

	u8 ip_tos, ip_tos_mask;

	struct rhash_head linkage;

	enum efx_encap_type tun_type;

	refcount_t ref;