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

Merge branch 'sfc-conntrack-offload' 



Edward Cree says:

====================
sfc: basic conntrack offload

Support offloading tracked connections and matching against them in
 TC chains on the PF and on representors.
Later patch serieses will add NAT and conntrack-on-tunnel-netdevs;
 keep it simple for now.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1c2c8c35 01ad088f

drivers/net/ethernet/sfc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ sfc-y += efx.o efx_common.o efx_channels.o nic.o \ 
sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o ef10_sriov.o ef100_sriov.o ef100_rep.o \

                           mae.o tc.o tc_bindings.o tc_counters.o \

                           tc_encap_actions.o

                           tc_encap_actions.o tc_conntrack.o



obj-$(CONFIG_SFC)	+= sfc.o

drivers/net/ethernet/sfc/bitfield.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
/* Lowest bit numbers and widths */

#define EFX_DUMMY_FIELD_LBN 0

#define EFX_DUMMY_FIELD_WIDTH 0

#define EFX_BYTE_0_LBN 0

#define EFX_BYTE_0_WIDTH 8

#define EFX_WORD_0_LBN 0

#define EFX_WORD_0_WIDTH 16

#define EFX_WORD_1_LBN 16

drivers/net/ethernet/sfc/mae.c

+823 −4

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/mae.h

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ int efx_mae_start_counters(struct efx_nic *efx, struct efx_rx_queue *rx_queue); 
int efx_mae_stop_counters(struct efx_nic *efx, struct efx_rx_queue *rx_queue);

void efx_mae_counters_grant_credits(struct work_struct *work);



int efx_mae_get_tables(struct efx_nic *efx);

void efx_mae_free_tables(struct efx_nic *efx);



#define MAE_NUM_FIELDS	(MAE_FIELD_ENC_VNET_ID + 1)



struct mae_caps {
@@ -81,6 +84,9 @@ int efx_mae_get_caps(struct efx_nic *efx, struct mae_caps *caps); 
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_match_check_caps_lhs(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, __be16 udp_sport_mask,

				   struct netlink_ext_ack *extack);
@@ -109,6 +115,12 @@ int efx_mae_register_encap_match(struct efx_nic *efx, 
				 struct efx_tc_encap_match *encap);

int efx_mae_unregister_encap_match(struct efx_nic *efx,

				   struct efx_tc_encap_match *encap);

int efx_mae_insert_lhs_rule(struct efx_nic *efx, struct efx_tc_lhs_rule *rule,

			    u32 prio);

int efx_mae_remove_lhs_rule(struct efx_nic *efx, struct efx_tc_lhs_rule *rule);

struct efx_tc_ct_entry; /* see tc_conntrack.h */

int efx_mae_insert_ct(struct efx_nic *efx, struct efx_tc_ct_entry *conn);

int efx_mae_remove_ct(struct efx_nic *efx, struct efx_tc_ct_entry *conn);



int efx_mae_insert_rule(struct efx_nic *efx, const struct efx_tc_match *match,

			u32 prio, u32 acts_id, u32 *id);

drivers/net/ethernet/sfc/mcdi.h

+14 −0
Original line number Diff line number Diff line
@@ -218,14 +218,28 @@ void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev); 
	BUILD_BUG_ON(_field ## _LEN != 1);				\

	*(u8 *)MCDI_STRUCT_PTR(_buf, _field) = _value;			\

	} while (0)

#define MCDI_STRUCT_POPULATE_BYTE_1(_buf, _field, _name, _value) do {	\

	efx_dword_t _temp;						\

	EFX_POPULATE_DWORD_1(_temp, _name, _value);			\

	MCDI_STRUCT_SET_BYTE(_buf, _field,				\

			     EFX_DWORD_FIELD(_temp, EFX_BYTE_0));	\

	} while (0)

#define MCDI_BYTE(_buf, _field)						\

	((void)BUILD_BUG_ON_ZERO(MC_CMD_ ## _field ## _LEN != 1),	\

	 *MCDI_PTR(_buf, _field))

#define MCDI_STRUCT_BYTE(_buf, _field)					\

	((void)BUILD_BUG_ON_ZERO(_field ## _LEN != 1),			\

	 *MCDI_STRUCT_PTR(_buf, _field))

#define MCDI_SET_WORD(_buf, _field, _value) do {			\

	BUILD_BUG_ON(MC_CMD_ ## _field ## _LEN != 2);			\

	BUILD_BUG_ON(MC_CMD_ ## _field ## _OFST & 1);			\

	*(__force __le16 *)MCDI_PTR(_buf, _field) = cpu_to_le16(_value);\

	} while (0)

#define MCDI_STRUCT_SET_WORD(_buf, _field, _value) do {			\

	BUILD_BUG_ON(_field ## _LEN != 2);				\

	BUILD_BUG_ON(_field ## _OFST & 1);				\

	*(__force __le16 *)MCDI_STRUCT_PTR(_buf, _field) = cpu_to_le16(_value);\

	} while (0)

#define MCDI_WORD(_buf, _field)						\

	((u16)BUILD_BUG_ON_ZERO(MC_CMD_ ## _field ## _LEN != 2) +	\

	 le16_to_cpu(*(__force const __le16 *)MCDI_PTR(_buf, _field)))