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

Commit c1ac403b authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Clean up RX event handling 



Add 'likely' hint to test of rx_checksum_enabled.
Don't count IP fragments; the IP stack can do that.
Do count non-matching multicast packets.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0228f5cd

drivers/net/sfc/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { 
	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_tobe_disc),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_ip_hdr_chksum_err),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_tcp_udp_chksum_err),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_mcast_mismatch),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_frm_trunc),

};

drivers/net/sfc/falcon.c

+5 −6
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
	bool rx_ev_tcp_udp_chksum_err, rx_ev_eth_crc_err;

	bool rx_ev_frm_trunc, rx_ev_drib_nib, rx_ev_tobe_disc;

	bool rx_ev_other_err, rx_ev_pause_frm;

	bool rx_ev_ip_frag_err, rx_ev_hdr_type, rx_ev_mcast_pkt;

	bool rx_ev_hdr_type, rx_ev_mcast_pkt;

	unsigned rx_ev_pkt_type;



	rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);
@@ -743,7 +743,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
	rx_ev_pkt_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_TYPE);

	rx_ev_buf_owner_id_err = EFX_QWORD_FIELD(*event,

						 FSF_AZ_RX_EV_BUF_OWNER_ID_ERR);

	rx_ev_ip_frag_err = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_IP_FRAG_ERR);

	rx_ev_ip_hdr_chksum_err = EFX_QWORD_FIELD(*event,

						  FSF_AZ_RX_EV_IP_HDR_CHKSUM_ERR);

	rx_ev_tcp_udp_chksum_err = EFX_QWORD_FIELD(*event,
@@ -771,8 +770,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, 
		else if (rx_ev_tcp_udp_chksum_err)

			++rx_queue->channel->n_rx_tcp_udp_chksum_err;

	}

	if (rx_ev_ip_frag_err)

		++rx_queue->channel->n_rx_ip_frag_err;



	/* The frame must be discarded if any of these are true. */

	*discard = (rx_ev_eth_crc_err | rx_ev_frm_trunc | rx_ev_drib_nib |
@@ -855,7 +852,7 @@ static void falcon_handle_rx_event(struct efx_channel *channel, 
		 * UDP/IPv4, then we can rely on the hardware checksum.

		 */

		checksummed =

			efx->rx_checksum_enabled &&

			likely(efx->rx_checksum_enabled) &&

			(rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_TCP ||

			 rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_UDP);

	} else {
@@ -870,9 +867,11 @@ static void falcon_handle_rx_event(struct efx_channel *channel, 
		unsigned int rx_ev_mcast_hash_match =

			EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_MCAST_HASH_MATCH);



		if (unlikely(!rx_ev_mcast_hash_match))

		if (unlikely(!rx_ev_mcast_hash_match)) {

			++channel->n_rx_mcast_mismatch;

			discard = true;

		}

	}



	channel->irq_mod_score += 2;

drivers/net/sfc/net_driver.h

+2 −2
Original line number Diff line number Diff line
@@ -350,9 +350,9 @@ enum efx_rx_alloc_method { 
 * @rx_alloc_push_pages: RX allocation method currently in use for pushing

 *	descriptors

 * @n_rx_tobe_disc: Count of RX_TOBE_DISC errors

 * @n_rx_ip_frag_err: Count of RX IP fragment errors

 * @n_rx_ip_hdr_chksum_err: Count of RX IP header checksum errors

 * @n_rx_tcp_udp_chksum_err: Count of RX TCP and UDP checksum errors

 * @n_rx_mcast_mismatch: Count of unmatched multicast frames

 * @n_rx_frm_trunc: Count of RX_FRM_TRUNC errors

 * @n_rx_overlength: Count of RX_OVERLENGTH errors

 * @n_skbuff_leaks: Count of skbuffs leaked due to RX overrun
@@ -380,9 +380,9 @@ struct efx_channel { 
	int rx_alloc_push_pages;



	unsigned n_rx_tobe_disc;

	unsigned n_rx_ip_frag_err;

	unsigned n_rx_ip_hdr_chksum_err;

	unsigned n_rx_tcp_udp_chksum_err;

	unsigned n_rx_mcast_mismatch;

	unsigned n_rx_frm_trunc;

	unsigned n_rx_overlength;

	unsigned n_skbuff_leaks;