| Message ID | alpine.DEB.2.02.1406300949290.5624@tomh.mtv.corp.google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2014-06-30 at 09:50 -0700, Tom Herbert wrote: > In process_backlog the input_pkt_queue is only checked once for new > packets and quota is artificially reduced to reflect precisely the > number of packets on the input_pkt_queue so that the loop exits > appropriately. > > This patches changes the behavior to be more straightforward and > less convoluted. Packets are processed until either the quota > is met or there are no more packets to process. > > This patch seems to provide a small, but noticeable performance > improvement. The performance improvement is a result of staying > in the process_backlog loop longer which can reduce number of IPI's. Yes, this is likely the fact that napi->state is cleared at the very end of the run. Acked-by: Eric Dumazet <edumazet@google.com> Thanks Tom ! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Tom Herbert <therbert@google.com> Date: Mon, 30 Jun 2014 09:50:40 -0700 (PDT) > In process_backlog the input_pkt_queue is only checked once for new > packets and quota is artificially reduced to reflect precisely the > number of packets on the input_pkt_queue so that the loop exits > appropriately. > > This patches changes the behavior to be more straightforward and > less convoluted. Packets are processed until either the quota > is met or there are no more packets to process. > > This patch seems to provide a small, but noticeable performance > improvement. The performance improvement is a result of staying > in the process_backlog loop longer which can reduce number of IPI's. > > Performance data using super_netperf TCP_RR with 200 flows: ... > Signed-off-by: Tom Herbert <therbert@google.com> Applied, thanks Tom. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index a04b12f..bb88964 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4227,9 +4227,8 @@ static int process_backlog(struct napi_struct *napi, int quota) #endif napi->weight = weight_p; local_irq_disable(); - while (work < quota) { + while (1) { struct sk_buff *skb; - unsigned int qlen; while ((skb = __skb_dequeue(&sd->process_queue))) { local_irq_enable(); @@ -4243,24 +4242,24 @@ static int process_backlog(struct napi_struct *napi, int quota) } rps_lock(sd); - qlen = skb_queue_len(&sd->input_pkt_queue); - if (qlen) - skb_queue_splice_tail_init(&sd->input_pkt_queue, - &sd->process_queue); - - if (qlen < quota - work) { + if (skb_queue_empty(&sd->input_pkt_queue)) { /* * Inline a custom version of __napi_complete(). * only current cpu owns and manipulates this napi, - * and NAPI_STATE_SCHED is the only possible flag set on backlog. - * we can use a plain write instead of clear_bit(), + * and NAPI_STATE_SCHED is the only possible flag set + * on backlog. + * We can use a plain write instead of clear_bit(), * and we dont need an smp_mb() memory barrier. */ list_del(&napi->poll_list); napi->state = 0; + rps_unlock(sd); - quota = work + qlen; + break; } + + skb_queue_splice_tail_init(&sd->input_pkt_queue, + &sd->process_queue); rps_unlock(sd); } local_irq_enable();
In process_backlog the input_pkt_queue is only checked once for new packets and quota is artificially reduced to reflect precisely the number of packets on the input_pkt_queue so that the loop exits appropriately. This patches changes the behavior to be more straightforward and less convoluted. Packets are processed until either the quota is met or there are no more packets to process. This patch seems to provide a small, but noticeable performance improvement. The performance improvement is a result of staying in the process_backlog loop longer which can reduce number of IPI's. Performance data using super_netperf TCP_RR with 200 flows: Before fix: 88.06% CPU utilization 125/190/309 90/95/99% latencies 1.46808e+06 tps 1145382 intrs.sec. With fix: 87.73% CPU utilization 122/183/296 90/95/99% latencies 1.4921e+06 tps 1021674.30 intrs./sec. Signed-off-by: Tom Herbert <therbert@google.com> --- net/core/dev.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)