From patchwork Thu Sep 12 13:28:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 11143075 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3E6F1599 for ; Thu, 12 Sep 2019 13:30:01 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B82AC20830 for ; Thu, 12 Sep 2019 13:30:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B82AC20830 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i8P93-0005ou-Fc; Thu, 12 Sep 2019 13:28:21 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i8P92-0005oa-VL for xen-devel@lists.xenproject.org; Thu, 12 Sep 2019 13:28:20 +0000 X-Inumbo-ID: 2f668a68-d561-11e9-b299-bc764e2007e4 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2f668a68-d561-11e9-b299-bc764e2007e4; Thu, 12 Sep 2019 13:28:20 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B2233B65C; Thu, 12 Sep 2019 13:28:18 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Thu, 12 Sep 2019 15:28:13 +0200 Message-Id: <20190912132813.6509-6-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190912132813.6509-1-jgross@suse.com> References: <20190912132813.6509-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v5 5/5] xen: add function name to lock profiling data X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A spinlock defined via DEFINE_SPINLOCK() as a static variable local to a function shows up in lock profiling just with its local variable name. This results in multiple locks just named "lock". In order to be able to distinguish those locks in the lock profiling output add the function name to struct lock_profile and initialize it with __PRETTY_FUNCTION__ (__func__ or __FUNCTION__ are not usable outside of functions with some compilers). Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 16 +++++++++++++--- xen/include/xen/spinlock.h | 4 +++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 673ef168da..3147bc3a7a 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -348,6 +348,7 @@ static s_time_t lock_profile_start; static struct lock_profile_anc *lock_profile_ancs; static struct lock_profile_qhead lock_profile_glb_q; static spinlock_t lock_profile_lock = SPIN_LOCK_UNLOCKED; +static const char *lock_profile_nofunc = __PRETTY_FUNCTION__; static void spinlock_profile_iterate(lock_profile_subfunc *sub, void *par) { @@ -371,8 +372,10 @@ static void spinlock_profile_print_elem(struct lock_profile *data, printk("%s ", type); if ( idx != LOCKPROF_IDX_NONE ) printk("%d ", idx); - printk("%s: addr=%p, lockval=%08x, ", data->name, lock, - lock->tickets.head_tail); + printk("%s", data->name); + if ( data->func && strcmp(data->func, lock_profile_nofunc) ) + printk("@%s", data->func); + printk(": addr=%p, lockval=%08x, ", lock, lock->tickets.head_tail); if ( lock->debug.cpu == SPINLOCK_NO_CPU ) printk("not locked\n"); else @@ -427,7 +430,14 @@ static void spinlock_profile_ucopy_elem(struct lock_profile *data, if ( p->pc->nr_elem < p->pc->max_elem ) { - safe_strcpy(elem.name, data->name); + if ( data->func && strcmp(data->func, lock_profile_nofunc) ) + { + snprintf(elem.name, sizeof(elem.name), "%s@%s", data->name, + data->func); + elem.name[sizeof(elem.name) - 1] = 0; + } + else + safe_strcpy(elem.name, data->name); safe_strcpy(elem.type, type); elem.idx = idx; elem.lock_cnt = data->lock_cnt; diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 401cc345fe..49b29f7c54 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -78,6 +78,7 @@ struct spinlock; struct lock_profile { struct lock_profile *next; /* forward link */ char *name; /* lock name */ + const char *func; /* function name */ struct spinlock *lock; /* the lock itself */ u64 lock_cnt; /* # of complete locking ops */ u64 block_cnt; /* # of complete wait for lock */ @@ -92,7 +93,8 @@ struct lock_profile_qhead { int32_t idx; /* index for printout */ }; -#define _LOCK_PROFILE(name) { 0, #name, &name, 0, 0, 0, 0, 0 } +#define _LOCK_PROFILE(name) { 0, #name, __PRETTY_FUNCTION__, &name, \ + 0, 0, 0, 0, 0 } #define _LOCK_PROFILE_PTR(name) \ static struct lock_profile * const __lock_profile_##name \ __used_section(".lockprofile.data") = \