Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit add72477 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Make most filter operations NIC-type-specific 



Aside from accelerated RFS, there is almost nothing that can be shared
between the filter table implementations for the Falcon architecture
and EF10.

Move the few shared functions into efx.c and rx.c and the rest into
farch.c.  Introduce efx_nic_type operations for the implementation and
inline wrapper functions that call these.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 9a0a9433

drivers/net/ethernet/sfc/Makefile

+0 −1
Original line number Diff line number Diff line 
sfc-y			+= efx.o nic.o farch.o falcon.o siena.o tx.o rx.o \

			   filter.o \

			   selftest.o ethtool.o qt202x_phy.o mdio_10g.o \

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_port.o mcdi_mon.o ptp.o

drivers/net/ethernet/sfc/efx.c

+39 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static void efx_start_datapath(struct efx_nic *efx) 


	/* RX filters also have scatter-enabled flags */

	if (efx->rx_scatter != old_rx_scatter)

		efx_filter_update_rx_scatter(efx);

		efx->type->filter_update_rx_scatter(efx);



	/* We must keep at least one descriptor in a TX ring empty.

	 * We could avoid this when the queue size does not exactly
@@ -1499,6 +1499,44 @@ static void efx_remove_nic(struct efx_nic *efx) 
	efx->type->remove(efx);

}



static int efx_probe_filters(struct efx_nic *efx)

{

	int rc;



	spin_lock_init(&efx->filter_lock);



	rc = efx->type->filter_table_probe(efx);

	if (rc)

		return rc;



#ifdef CONFIG_RFS_ACCEL

	if (efx->type->offload_features & NETIF_F_NTUPLE) {

		efx->rps_flow_id = kcalloc(efx->type->max_rx_ip_filters,

					   sizeof(*efx->rps_flow_id),

					   GFP_KERNEL);

		if (!efx->rps_flow_id) {

			efx->type->filter_table_remove(efx);

			return -ENOMEM;

		}

	}

#endif



	return 0;

}



static void efx_remove_filters(struct efx_nic *efx)

{

#ifdef CONFIG_RFS_ACCEL

	kfree(efx->rps_flow_id);

#endif

	efx->type->filter_table_remove(efx);

}



static void efx_restore_filters(struct efx_nic *efx)

{

	efx->type->filter_table_restore(efx);

}



/**************************************************************************

 *

 * NIC startup/shutdown

drivers/net/ethernet/sfc/efx.h

+86 −21
Original line number Diff line number Diff line
@@ -68,27 +68,92 @@ extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue); 
#define EFX_TXQ_MIN_ENT(efx)	(2 * efx_tx_max_skb_descs(efx))



/* Filters */

extern int efx_probe_filters(struct efx_nic *efx);

extern void efx_restore_filters(struct efx_nic *efx);

extern void efx_remove_filters(struct efx_nic *efx);

extern void efx_filter_update_rx_scatter(struct efx_nic *efx);

extern s32 efx_filter_insert_filter(struct efx_nic *efx,



/**

 * efx_filter_insert_filter - add or replace a filter

 * @efx: NIC in which to insert the filter

 * @spec: Specification for the filter

 * @replace_equal: Flag for whether the specified filter may replace an

 *	existing filter with equal priority

 *

 * On success, return the filter ID.

 * On failure, return a negative error code.

 *

 * If an existing filter has equal match values to the new filter

 * spec, then the new filter might replace it, depending on the

 * relative priorities.  If the existing filter has lower priority, or

 * if @replace_equal is set and it has equal priority, then it is

 * replaced.  Otherwise the function fails, returning -%EPERM if

 * the existing filter has higher priority or -%EEXIST if it has

 * equal priority.

 */

static inline s32 efx_filter_insert_filter(struct efx_nic *efx,

					   struct efx_filter_spec *spec,

				    bool replace);

extern int efx_filter_remove_id_safe(struct efx_nic *efx,

					   bool replace_equal)

{

	return efx->type->filter_insert(efx, spec, replace_equal);

}



/**

 * efx_filter_remove_id_safe - remove a filter by ID, carefully

 * @efx: NIC from which to remove the filter

 * @priority: Priority of filter, as passed to @efx_filter_insert_filter

 * @filter_id: ID of filter, as returned by @efx_filter_insert_filter

 *

 * This function will range-check @filter_id, so it is safe to call

 * with a value passed from userland.

 */

static inline int efx_filter_remove_id_safe(struct efx_nic *efx,

					    enum efx_filter_priority priority,

				     u32 filter_id);

extern int efx_filter_get_filter_safe(struct efx_nic *efx,

					    u32 filter_id)

{

	return efx->type->filter_remove_safe(efx, priority, filter_id);

}



/**

 * efx_filter_get_filter_safe - retrieve a filter by ID, carefully

 * @efx: NIC from which to remove the filter

 * @priority: Priority of filter, as passed to @efx_filter_insert_filter

 * @filter_id: ID of filter, as returned by @efx_filter_insert_filter

 * @spec: Buffer in which to store filter specification

 *

 * This function will range-check @filter_id, so it is safe to call

 * with a value passed from userland.

 */

static inline int

efx_filter_get_filter_safe(struct efx_nic *efx,

			   enum efx_filter_priority priority,

				      u32 filter_id, struct efx_filter_spec *);

extern void efx_filter_clear_rx(struct efx_nic *efx,

				enum efx_filter_priority priority);

extern u32 efx_filter_count_rx_used(struct efx_nic *efx,

				    enum efx_filter_priority priority);

extern u32 efx_filter_get_rx_id_limit(struct efx_nic *efx);

extern s32 efx_filter_get_rx_ids(struct efx_nic *efx,

			   u32 filter_id, struct efx_filter_spec *spec)

{

	return efx->type->filter_get_safe(efx, priority, filter_id, spec);

}



/**

 * efx_farch_filter_clear_rx - remove RX filters by priority

 * @efx: NIC from which to remove the filters

 * @priority: Maximum priority to remove

 */

static inline void efx_filter_clear_rx(struct efx_nic *efx,

				       enum efx_filter_priority priority)

{

	return efx->type->filter_clear_rx(efx, priority);

}



static inline u32 efx_filter_count_rx_used(struct efx_nic *efx,

					   enum efx_filter_priority priority)

{

	return efx->type->filter_count_rx_used(efx, priority);

}

static inline u32 efx_filter_get_rx_id_limit(struct efx_nic *efx)

{

	return efx->type->filter_get_rx_id_limit(efx);

}

static inline s32 efx_filter_get_rx_ids(struct efx_nic *efx,

					enum efx_filter_priority priority,

				 u32 *buf, u32 size);

					u32 *buf, u32 size)

{

	return efx->type->filter_get_rx_ids(efx, priority, buf, size);

}

#ifdef CONFIG_RFS_ACCEL

extern int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,

			  u16 rxq_index, u32 flow_id);

drivers/net/ethernet/sfc/falcon.c

+31 −0
Original line number Diff line number Diff line
@@ -2400,6 +2400,21 @@ const struct efx_nic_type falcon_a1_nic_type = { 
	.ev_read_ack = efx_farch_ev_read_ack,

	.ev_test_generate = efx_farch_ev_test_generate,



	/* We don't expose the filter table on Falcon A1 as it is not

	 * mapped into function 0, but these implementations still

	 * work with a degenerate case of all tables set to size 0.

	 */

	.filter_table_probe = efx_farch_filter_table_probe,

	.filter_table_restore = efx_farch_filter_table_restore,

	.filter_table_remove = efx_farch_filter_table_remove,

	.filter_insert = efx_farch_filter_insert,

	.filter_remove_safe = efx_farch_filter_remove_safe,

	.filter_get_safe = efx_farch_filter_get_safe,

	.filter_clear_rx = efx_farch_filter_clear_rx,

	.filter_count_rx_used = efx_farch_filter_count_rx_used,

	.filter_get_rx_id_limit = efx_farch_filter_get_rx_id_limit,

	.filter_get_rx_ids = efx_farch_filter_get_rx_ids,



	.revision = EFX_REV_FALCON_A1,

	.txd_ptr_tbl_base = FR_AA_TX_DESC_PTR_TBL_KER,

	.rxd_ptr_tbl_base = FR_AA_RX_DESC_PTR_TBL_KER,
@@ -2468,6 +2483,21 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.ev_process = efx_farch_ev_process,

	.ev_read_ack = efx_farch_ev_read_ack,

	.ev_test_generate = efx_farch_ev_test_generate,

	.filter_table_probe = efx_farch_filter_table_probe,

	.filter_table_restore = efx_farch_filter_table_restore,

	.filter_table_remove = efx_farch_filter_table_remove,

	.filter_update_rx_scatter = efx_farch_filter_update_rx_scatter,

	.filter_insert = efx_farch_filter_insert,

	.filter_remove_safe = efx_farch_filter_remove_safe,

	.filter_get_safe = efx_farch_filter_get_safe,

	.filter_clear_rx = efx_farch_filter_clear_rx,

	.filter_count_rx_used = efx_farch_filter_count_rx_used,

	.filter_get_rx_id_limit = efx_farch_filter_get_rx_id_limit,

	.filter_get_rx_ids = efx_farch_filter_get_rx_ids,

#ifdef CONFIG_RFS_ACCEL

	.filter_rfs_insert = efx_farch_filter_rfs_insert,

	.filter_rfs_expire_one = efx_farch_filter_rfs_expire_one,

#endif



	.revision = EFX_REV_FALCON_B0,

	.txd_ptr_tbl_base = FR_BZ_TX_DESC_PTR_TBL,
@@ -2483,5 +2513,6 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,

	.offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE,

	.mcdi_max_ver = -1,

	.max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,

};

drivers/net/ethernet/sfc/farch.c

+1108 −0

File changed.

Preview size limit exceeded, changes collapsed.