Skip to content

Commit f208e95

Browse files
committed
SUNRPC: Count ingress RPC messages per svc_pool
svc_xprt_enqueue() can be costly, since it involves selecting and waking up a process. More than one enqueue is done per incoming RPC. For example, svc_data_ready() enqueues, and so does svc_xprt_receive(). Also, if an RPC message requires more than one call to ->recvfrom() to receive it fully, each one of those calls does an enqueue. To get a sense of the average number of transport enqueue operations needed to process an incoming RPC message, re-use the "packets" pool stat. Track the number of complete RPC messages processed by each thread pool. Reviewed-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: NeilBrown <neilb@suse.de> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 850bac3 commit f208e95

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

include/linux/sunrpc/svc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ struct svc_pool {
3939
struct list_head sp_all_threads; /* all server threads */
4040

4141
/* statistics on pool operation */
42+
struct percpu_counter sp_messages_arrived;
4243
struct percpu_counter sp_sockets_queued;
4344
struct percpu_counter sp_threads_woken;
4445

net/sunrpc/svc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
513513
INIT_LIST_HEAD(&pool->sp_all_threads);
514514
spin_lock_init(&pool->sp_lock);
515515

516+
percpu_counter_init(&pool->sp_messages_arrived, 0, GFP_KERNEL);
516517
percpu_counter_init(&pool->sp_sockets_queued, 0, GFP_KERNEL);
517518
percpu_counter_init(&pool->sp_threads_woken, 0, GFP_KERNEL);
518519
}
@@ -587,6 +588,7 @@ svc_destroy(struct kref *ref)
587588
for (i = 0; i < serv->sv_nrpools; i++) {
588589
struct svc_pool *pool = &serv->sv_pools[i];
589590

591+
percpu_counter_destroy(&pool->sp_messages_arrived);
590592
percpu_counter_destroy(&pool->sp_sockets_queued);
591593
percpu_counter_destroy(&pool->sp_threads_woken);
592594
}

net/sunrpc/svc_xprt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ void svc_recv(struct svc_rqst *rqstp)
871871

872872
if (serv->sv_stats)
873873
serv->sv_stats->netcnt++;
874+
percpu_counter_inc(&rqstp->rq_pool->sp_messages_arrived);
874875
rqstp->rq_stime = ktime_get();
875876
svc_process(rqstp);
876877
out:
@@ -1420,7 +1421,7 @@ static int svc_pool_stats_show(struct seq_file *m, void *p)
14201421

14211422
seq_printf(m, "%u %llu %llu %llu 0\n",
14221423
pool->sp_id,
1423-
percpu_counter_sum_positive(&pool->sp_sockets_queued),
1424+
percpu_counter_sum_positive(&pool->sp_messages_arrived),
14241425
percpu_counter_sum_positive(&pool->sp_sockets_queued),
14251426
percpu_counter_sum_positive(&pool->sp_threads_woken));
14261427

0 commit comments

Comments
 (0)