From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752274AbcBJXBv (ORCPT ); Wed, 10 Feb 2016 18:01:51 -0500 Received: from mga04.intel.com ([192.55.52.120]:53296 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbcBJXBt (ORCPT ); Wed, 10 Feb 2016 18:01:49 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,427,1449561600"; d="scan'208";a="881617294" From: Andi Kleen To: tytso@mit.edu Cc: linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 3/3] random: Add pool name to urandom_read trace point Date: Wed, 10 Feb 2016 15:01:37 -0800 Message-Id: <1455145297-30897-4-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1455145297-30897-1-git-send-email-andi@firstfloor.org> References: <1455145297-30897-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Now that we have multiple nonblocking_pools it makes sense to report the name of the pool in the urandom_read trace point. Extend the trace point to report the name too. Signed-off-by: Andi Kleen --- drivers/char/random.c | 2 +- include/trace/events/random.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index a395f783..de6dca8 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1590,7 +1590,7 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) nbytes = min_t(size_t, nbytes, INT_MAX >> (ENTROPY_SHIFT + 3)); ret = extract_entropy_user(pool, buf, nbytes); - trace_urandom_read(8 * nbytes, ENTROPY_BITS(pool), + trace_urandom_read(pool->name, 8 * nbytes, ENTROPY_BITS(pool), ENTROPY_BITS(pool)); return ret; } diff --git a/include/trace/events/random.h b/include/trace/events/random.h index 4684de3..3b5ab5a 100644 --- a/include/trace/events/random.h +++ b/include/trace/events/random.h @@ -288,25 +288,27 @@ TRACE_EVENT(random_read, ); TRACE_EVENT(urandom_read, - TP_PROTO(int got_bits, int pool_left, int input_left), + TP_PROTO(const char *pool, int got_bits, int pool_left, int input_left), - TP_ARGS(got_bits, pool_left, input_left), + TP_ARGS(pool, got_bits, pool_left, input_left), TP_STRUCT__entry( + __field( const char *, pool ) __field( int, got_bits ) __field( int, pool_left ) __field( int, input_left ) ), TP_fast_assign( + __entry->pool = pool; __entry->got_bits = got_bits; __entry->pool_left = pool_left; __entry->input_left = input_left; ), TP_printk("got_bits %d nonblocking_pool_entropy_left %d " - "input_entropy_left %d", __entry->got_bits, - __entry->pool_left, __entry->input_left) + "input_entropy_left %d from %s", __entry->got_bits, + __entry->pool_left, __entry->input_left, __entry->pool) ); #endif /* _TRACE_RANDOM_H */ -- 2.4.3