sfc: falcon: don't score irq moderation points for GRO

ecree-solarflare · davem330 · commit 67270136949e · 2019-08-08T18:22:29.000-07:00
Same rationale as for sfc, except that this wasn't performance-tested.

Signed-off-by: Edward Cree &lt;ecree@solarflare.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/sfc/falcon/rx.c b/drivers/net/ethernet/sfc/falcon/rx.c
@@ -424,7 +424,6 @@ ef4_rx_packet_gro(struct ef4_channel *channel, struct ef4_rx_buffer *rx_buf,
 		  unsigned int n_frags, u8 *eh)
 {
 	struct napi_struct *napi = &channel->napi_str;
-	gro_result_t gro_result;
 	struct ef4_nic *efx = channel->efx;
 	struct sk_buff *skb;
 
@@ -460,9 +459,7 @@ ef4_rx_packet_gro(struct ef4_channel *channel, struct ef4_rx_buffer *rx_buf,
 
 	skb_record_rx_queue(skb, channel->rx_queue.core_index);
 
-	gro_result = napi_gro_frags(napi);
-	if (gro_result != GRO_DROP)
-		channel->irq_mod_score += 2;
+	napi_gro_frags(napi);
 }
 
 /* Allocate and construct an SKB around page fragments */

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,6 @@ ef4_rx_packet_gro(struct ef4_channel channel, struct ef4_rx_buffer rx_buf,`
`424`	`424`	`unsigned int n_frags, u8 *eh)`
`425`	`425`	`{`
`426`	`426`	`struct napi_struct *napi = &channel->napi_str;`
`427`		`- gro_result_t gro_result;`
`428`	`427`	`struct ef4_nic *efx = channel->efx;`
`429`	`428`	`struct sk_buff *skb;`
`430`	`429`
`@@ -460,9 +459,7 @@ ef4_rx_packet_gro(struct ef4_channel channel, struct ef4_rx_buffer rx_buf,`
`460`	`459`
`461`	`460`	`skb_record_rx_queue(skb, channel->rx_queue.core_index);`
`462`	`461`
`463`		`- gro_result = napi_gro_frags(napi);`
`464`		`- if (gro_result != GRO_DROP)`
`465`		`- channel->irq_mod_score += 2;`
	`462`	`+ napi_gro_frags(napi);`
`466`	`463`	`}`
`467`	`464`
`468`	`465`	`/* Allocate and construct an SKB around page fragments */`