From patchwork Mon May 2 04:10:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8989801 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9D2DC9F39D for ; Mon, 2 May 2016 04:13:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62C8E20173 for ; Mon, 2 May 2016 04:13:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98FFC20204 for ; Mon, 2 May 2016 04:13:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax5CQ-0002GO-KH; Mon, 02 May 2016 04:11:10 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax5CP-0002DI-Mb for xen-devel@lists.xen.org; Mon, 02 May 2016 04:11:09 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 15/BF-07120-D53D6275; Mon, 02 May 2016 04:11:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMXThId2Yy2r hBqu+6Vos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkPlj5mL9jtXnHw7ETmBsYvFl2MXBxCApMY JdZ/+8YM4rAIzGOW2DznOJgjIdDPKvGgbTtTFyMnkBMjcW7jZVYIu0LiyPZb7CC2kICCxO8Jh 5ggRk1mkni0fCczSIJNQEPiya8ZbCC2iIC0xLXPlxlBbGaBEom983+A2cICThLrf+0EW8AioC rx9/oFMJtXwFHi9LYGoAUcQMvkJBa89wEJcwKV933dxAyx11Hi6Yf7jBMYBRYwMqxiVC9OLSp LLdI10ksqykzPKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECAwsBiDYwbjsr9MhRkkOJiVR 3snH1MKF+JLyUyozEosz4otKc1KLDzHKcHAoSfBmXgLKCRalpqdWpGXmAEMcJi3BwaMkwmt7D ijNW1yQmFucmQ6ROsVoybHl97W1TByfNt4Bktum3lvLJMSSl5+XKiXOawIyTwCkIaM0D24cLA 4vMcpKCfMyAh0oxFOQWpSbWYIq/4pRnINRSZjXG2QKT2ZeCdzWV0AHMQEdlL1eFeSgkkSElFQ D48K5vkaT5H4Lhbr+ro9x6apeIbdEauLdjSd1emTj3pin1SSn6cp3qRQfz5AytPSynTJFsXzG ny0Lu155XM38kZd2w1KNaU31k5/6T8tmxAVmcQR8ND5yh/klU5ryTH+VYLuuQx+D/07LKfvZt Ghi/FGfSw03r931OzF559vPXjWfdV+/EHKNUmIpzkg01GIuKk4EAJpHYUG+AgAA X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1462162267!12151841!1 X-Originating-IP: [209.85.161.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53366 invoked from network); 2 May 2016 04:11:08 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-9.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 2 May 2016 04:11:08 -0000 Received: by mail-yw0-f194.google.com with SMTP id i22so17783122ywc.1 for ; Sun, 01 May 2016 21:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4oMIwuP1Mt5JAiXL6Ia3reohLpNlW7W/4RR3cxalMRU=; b=Z5mvlW764kb5dB0rOwKny9JT6aCQmAZT0fGInzuqrWGAb34n8optT7pAmvrzycBVPj 1pH3mLD6tTE50GazxRJfHuu1/L8cE7ypMB0rjTXCkYzSNJQe0z9seb5DOIBoBR6oqimP x3+Kmqcrvtq2mLgtZPbc64VQ6iCSqMbeo56pY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4oMIwuP1Mt5JAiXL6Ia3reohLpNlW7W/4RR3cxalMRU=; b=FCyg5bDhlI+iAhOrw3/sckdEf/XTEsbbv1jkgTVh82P+g/pqzRQZkqX9a1fJRCPT8R 8y50cVi+JEGTHlAEgIEZ94u6jvOlMelQBilsjNLzZRd3o8g5fG+W/ybaiJUIcU/yscoO zhqljT7PrDdOewYaHJyU8jNHuokNnM0oSytnC1ibpfi6+l9MnKQGCyq+eHqWG/RIsSp+ 53+sf7L+e18zce5KlVna+Z3G06ZC0HwgMPyhKy2wsNndDYZYeYzFfWfdRDT4f6KTHEUc WV29n0JaKQckoEbBMwUh/wIL43CQmhOaKkT3XSs4jcq0ZahGAyJA5vTK/UzzO3gDKi/4 ZmuQ== X-Gm-Message-State: AOPr4FXWmV0VapKkfptcVbhkQYiL3dj5rRGztzTpaakLPQGkyk5SG3IbgqwPtpu8BWLqow== X-Received: by 10.13.198.5 with SMTP id i5mr19991744ywd.263.1462162267387; Sun, 01 May 2016 21:11:07 -0700 (PDT) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id j3sm14334897ywj.32.2016.05.01.21.11.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 May 2016 21:11:06 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Sun, 1 May 2016 23:10:45 -0500 Message-Id: <1462162246-32413-7-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1462162246-32413-1-git-send-email-cardoe@cardoe.com> References: <1462162246-32413-1-git-send-email-cardoe@cardoe.com> Cc: Andrew Cooper , Doug Goldstein , Jan Beulich Subject: [Xen-devel] [RFC PATCH 6/7] build: convert perfc{, _arrays} to Kconfig X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID,UNPARSEABLE_RELAY,URIBL_BLACK autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert the 'perfc' and 'perfc_arrays' options to Kconfig as CONFIG_PERF_COUNTERS and CONFIG_PERF_ARRAYS to minimize code changes. Signed-off-by: Doug Goldstein --- CC: Jan Beulich CC: Andrew Cooper --- INSTALL | 2 -- xen/Kconfig.debug | 13 +++++++++++++ xen/Rules.mk | 10 ---------- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/time.c | 4 ++-- xen/arch/x86/x86_64/asm-offsets.c | 2 +- xen/common/Makefile | 2 +- xen/common/keyhandler.c | 2 +- xen/common/perfc.c | 2 +- xen/common/sysctl.c | 2 +- xen/include/asm-x86/asm_defns.h | 2 +- xen/include/asm-x86/domain.h | 2 +- xen/include/xen/perfc.h | 8 ++++---- xen/include/xen/sched.h | 2 +- 14 files changed, 28 insertions(+), 27 deletions(-) diff --git a/INSTALL b/INSTALL index f55d42c..623887d 100644 --- a/INSTALL +++ b/INSTALL @@ -227,8 +227,6 @@ VGABIOS_REL_DATE="dd Mon yyyy" The following variables can be used to tweak some aspects of the hypervisor build. -perfc=y -perfc_arrays=y lock_profile=y lto=y diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index ec27b09..4727273 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -28,6 +28,19 @@ config FRAME_POINTER maybe slower, but it gives very useful debugging information in case of any Xen bugs. +config PERF_ARRAYS + bool "Performance Counter Arrays" + default n + depends on PERF_COUNTERS + ---help--- + Performance Counter Arrays + +config PERF_COUNTERS + bool "Performance Counters" + default n + ---help--- + Performance Counters + config VERBOSE_DEBUG bool "Verbose debug messages" default y diff --git a/xen/Rules.mk b/xen/Rules.mk index 84b9d81..7e2cb5f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -3,8 +3,6 @@ # If you change any of these configuration options then you must # 'make clean' before rebuilding. # -perfc ?= n -perfc_arrays ?= n lock_profile ?= n lto ?= n @@ -12,12 +10,6 @@ lto ?= n include $(XEN_ROOT)/Config.mk -# Hardcoded configuration implications and dependencies. -# Do this is a neater way if it becomes unwieldy. -ifeq ($(perfc_arrays),y) -perfc := y -endif - ifneq ($(origin kexec),undefined) $(error "You must use 'make menuconfig' to enable/disable kexec now.") endif @@ -51,8 +43,6 @@ ifneq ($(clang),y) CFLAGS += -Wa,--strip-local-absolute endif -CFLAGS-$(perfc) += -DPERF_COUNTERS -CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(CONFIG_FRAME_POINTER) += -fno-omit-frame-pointer diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 82e2ed1..8519dc9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3526,7 +3526,7 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, static uint64_t _hvm_rdtsc_intercept(void) { struct vcpu *curr = current; -#if !defined(NDEBUG) || defined(PERF_COUNTERS) +#if !defined(NDEBUG) || defined(CONFIG_PERF_COUNTERS) struct domain *currd = curr->domain; if ( currd->arch.vtsc ) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 6438b47..3928a5f 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1688,7 +1688,7 @@ void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs, int rdtscp) spin_lock(&d->arch.vtsc_lock); -#if !defined(NDEBUG) || defined(PERF_COUNTERS) +#if !defined(NDEBUG) || defined(CONFIG_PERF_COUNTERS) if ( guest_kernel_mode(v, regs) ) d->arch.vtsc_kerncount++; else @@ -1959,7 +1959,7 @@ static void dump_softtsc(unsigned char key) printk(",khz=%"PRIu32, d->arch.tsc_khz); if ( d->arch.incarnation ) printk(",inc=%"PRIu32, d->arch.incarnation); -#if !defined(NDEBUG) || defined(PERF_COUNTERS) +#if !defined(NDEBUG) || defined(CONFIG_PERF_COUNTERS) if ( !(d->arch.vtsc_kerncount | d->arch.vtsc_usercount) ) printk("\n"); else diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index fa37ee0..891ddc8 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -151,7 +151,7 @@ void __dummy__(void) OFFSET(TRAPBOUNCE_eip, struct trap_bounce, eip); BLANK(); -#if PERF_COUNTERS +#if CONFIG_PERF_COUNTERS DEFINE(ASM_PERFC_hypercalls, PERFC_hypercalls); DEFINE(ASM_PERFC_exceptions, PERFC_exceptions); BLANK(); diff --git a/xen/common/Makefile b/xen/common/Makefile index a98bcc2..5891b1c 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -64,7 +64,7 @@ obj-$(CONFIG_XSPLICE) += xsplice_elf.o obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 earlycpio,$(n).init.o) -obj-$(perfc) += perfc.o +obj-$(CONFIG_PERF_COUNTERS) += perfc.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o xlat.o) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 4ff90f6..65b70ce 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -59,7 +59,7 @@ static struct keyhandler { IRQ_KEYHANDLER('%', do_debug_key, "trap to xendbg", 0), IRQ_KEYHANDLER('*', run_all_keyhandlers, "print all diagnostics", 0), -#ifdef PERF_COUNTERS +#ifdef CONFIG_PERF_COUNTERS KEYHANDLER('p', perfc_printall, "print performance counters", 1), KEYHANDLER('P', perfc_reset, "reset performance counters", 0), #endif diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 9f078e1..3da4c96 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -78,7 +78,7 @@ void perfc_printall(unsigned char key) printk("TOTAL[%12Lu]", sum); if (sum) { -#ifdef PERF_ARRAYS +#ifdef CONFIG_PERF_ARRAYS for ( k = 0; k < perfc_info[i].nr_elements; k++ ) { sum = 0; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 9a4cc1f..11bef0e 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -115,7 +115,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) } break; -#ifdef PERF_COUNTERS +#ifdef CONFIG_PERF_COUNTERS case XEN_SYSCTL_perfc_op: ret = perfc_control(&op->u.perfc_op); break; diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index b5f79d8..24f5404 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -363,7 +363,7 @@ static always_inline void stac(void) #endif -#ifdef PERF_COUNTERS +#ifdef CONFIG_PERF_COUNTERS #define PERFC_INCR(_name,_idx,_cur) \ pushq _cur; \ movslq VCPU_processor(_cur),_cur; \ diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 165e533..783fa4f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -377,7 +377,7 @@ struct arch_domain hardware TSC scaling cases */ uint32_t incarnation; /* incremented every restore or live migrate (possibly other cases in the future */ -#if !defined(NDEBUG) || defined(PERF_COUNTERS) +#if !defined(NDEBUG) || defined(CONFIG_PERF_COUNTERS) uint64_t vtsc_kerncount; uint64_t vtsc_usercount; #endif diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h index 6cb0cd1..6846e71 100644 --- a/xen/include/xen/perfc.h +++ b/xen/include/xen/perfc.h @@ -1,7 +1,7 @@ #ifndef __XEN_PERFC_H__ #define __XEN_PERFC_H__ -#ifdef PERF_COUNTERS +#ifdef CONFIG_PERF_COUNTERS #include #include @@ -76,7 +76,7 @@ DECLARE_PER_CPU(perfc_t[NUM_PERFCOUNTERS], perfcounters); * Histogram: special treatment for 0 and 1 count. After that equally spaced * with last bucket taking the rest. */ -#ifdef PERF_ARRAYS +#ifdef CONFIG_PERF_ARRAYS #define perfc_incr_histo(x,v) \ do { \ if ( (v) == 0 ) \ @@ -100,7 +100,7 @@ extern void perfc_printall(unsigned char key); extern void perfc_reset(unsigned char key); -#else /* PERF_COUNTERS */ +#else /* CONFIG_PERF_COUNTERS */ #define perfc_value(x) (0) #define perfc_valuea(x,y) (0) @@ -114,6 +114,6 @@ extern void perfc_reset(unsigned char key); #define perfc_adda(x,y,z) ((void)0) #define perfc_incr_histo(x,y,z) ((void)0) -#endif /* PERF_COUNTERS */ +#endif /* CONFIG_PERF_COUNTERS */ #endif /* __XEN_PERFC_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 09fff5f..651cd96 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -38,7 +38,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_info_compat_t); * Enable and ease the use of scheduling related performance counters. * */ -#ifdef PERF_COUNTERS +#ifdef CONFIG_PERF_COUNTERS #define SCHED_STATS #endif